undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/maint-apply-match-beginning'

Browse Source 
* jc/maint-apply-match-beginning:
  Fix "git apply" to correctly enforce "match at the beginning"
This commit is contained in:
Junio C Hamano 2008-04-06 20:04:29 -07:00
commit a1c0dca43a
2 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
builtin-apply.c
View File

@ -1937,21 +1937,24 @@ static int apply_one_fragment(struct image *img, struct fragment *frag,
trailing = frag->trailing;
/*
* If we don't have any leading/trailing data in the patch,
* we want it to match at the beginning/end of the file.
* A hunk to change lines at the beginning would begin with
* @@ -1,L +N,M @@
*
* But that would break if the patch is generated with
* --unified=0; sane people wouldn't do that to cause us
* trouble, but we try to please not so sane ones as well.
* And a hunk to add to an empty file would begin with
* @@ -0,0 +N,M @@
*
* In other words, a hunk that is (frag->oldpos <= 1) with or
* without leading context must match at the beginning.
*/
if (unidiff_zero) {
match_beginning = (!leading && !frag->oldpos);
match_end = 0;
}
else {
match_beginning = !leading && (frag->oldpos == 1);
match_end = !trailing;
}
match_beginning = frag->oldpos <= 1;
/*
* A hunk without trailing lines must match at the end.
* However, we simply cannot tell if a hunk must match end
* from the lack of trailing lines if the patch was generated
* with unidiff without any context.
*/
match_end = !unidiff_zero && !trailing;
pos = frag->newpos ? (frag->newpos - 1) : 0;
preimage.buf = oldlines;

13
t/t4104-apply-boundary.sh
View File

@ -112,4 +112,17 @@ do
'
done
test_expect_success 'two lines' '
>file &&
git add file &&
echo aaa >file &&
git diff >patch &&
git add file &&
echo bbb >file &&
git add file &&
test_must_fail git apply --check patch
'
test_done