summaryrefslogtreecommitdiff
path: root/t/t4113-apply-ending.sh
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@osdl.org>2006-05-24 02:08:01 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-05-24 04:45:09 (GMT)
commit1bf1a859ae980a73552c76fe20a5952a763ec81e (patch)
tree857ddfae223f04aa553052d2359a912bf4718bc5 /t/t4113-apply-ending.sh
parent36f5b1f0c800a23b9755a0214c1c3250f34f2486 (diff)
downloadgit-1bf1a859ae980a73552c76fe20a5952a763ec81e.zip
git-1bf1a859ae980a73552c76fe20a5952a763ec81e.tar.gz
git-1bf1a859ae980a73552c76fe20a5952a763ec81e.tar.bz2
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>
Diffstat (limited to 't/t4113-apply-ending.sh')
0 files changed, 0 insertions, 0 deletions