| commit | 032bea55a3fda805382398020657f738b8176729 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 17 May 2008 09:02:44 +0000 (17 02:02 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 17 May 2008 09:57:33 +0000 (17 02:57 -0700) | ||
| tree | 53e7b5693c5d337202aa7058504e11b3e380534e | treesnapshot (tar.gz zip) |
| parent | 5c47f4c6e71e6de08348f837f38a446a2f2b0ed7 | commitdiff |
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>
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>
| builtin-apply.c | diffblobblamehistory | |
| t/t4126-apply-empty.sh | [new file with mode: 0755] | blob |