summaryrefslogtreecommitdiff
path: root/contrib/examples
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-05-17 09:02:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-05-17 09:57:33 (GMT)
commit032bea55a3fda805382398020657f738b8176729 (patch)
tree53e7b5693c5d337202aa7058504e11b3e380534e /contrib/examples
parent5c47f4c6e71e6de08348f837f38a446a2f2b0ed7 (diff)
downloadgit-032bea55a3fda805382398020657f738b8176729.zip
git-032bea55a3fda805382398020657f738b8176729.tar.gz
git-032bea55a3fda805382398020657f738b8176729.tar.bz2
builtin-apply: do not declare patch is creation when we do not know it
When we see no context nor deleted line in the patch, we used to declare that the patch creates a new file. But some people create an empty file and then apply a patch to it. Similarly, a patch that delete everything is not a deletion patch either. This commit corrects these two issues. Together with the previous commit, it allows a diff between an empty file and a line-ful file to be treated as both creation patch and "add stuff to an existing empty file", depending on the context. A new test t4126 demonstrates the fix. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/examples')
0 files changed, 0 insertions, 0 deletions