| commit | 1bf1a859ae980a73552c76fe20a5952a763ec81e | |
| author | Linus Torvalds <torvalds@osdl.org> | |
| Wed, 24 May 2006 02:08:01 +0000 (23 19:08 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 24 May 2006 04:45:09 +0000 (23 21:45 -0700) | ||
| tree | 857ddfae223f04aa553052d2359a912bf4718bc5 | treesnapshot (tar.gz zip) |
| parent | 36f5b1f0c800a23b9755a0214c1c3250f34f2486 | commitdiff |
apply: treat EOF as proper context.
Catalin noticed that we do not treat end-of-file condition shown
in the patch text as the patch context. This causes a patch
that appends at the end of the file to cleanly apply even if
something else has been appended to the file. If this happened
in the middle, we would refuse by saying that the file has
conflicting modifications.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Catalin noticed that we do not treat end-of-file condition shown
in the patch text as the patch context. This causes a patch
that appends at the end of the file to cleanly apply even if
something else has been appended to the file. If this happened
in the middle, we would refuse by saying that the file has
conflicting modifications.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| apply.c | diffblobblamehistory |