builtin-apply: keep information about files to be deleted
Example correct diff generated by `diff -M -B' might look like this: diff --git a/file1 b/file2 similarity index 100% rename from file1 rename to file2 diff --git a/file2 b/file1 similarity index 100% rename from file2 rename to file1 Information about removing `file2' comes after information about creation of new `file2' (renamed from `file1'). Existing implementation isn't able to apply such patch, because it has to know in advance which files will be removed. This patch populates fn_table with information about removal of files before calling check_patch() for each patch to be applied. Signed-off-by: Michał Kiedrowicz <michal.kiedrowicz@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
d8c81dfcaf
commit
7fac0eef91
@ -31,7 +31,7 @@ test_expect_success 'diff -M -B' '
|
||||
|
||||
'
|
||||
|
||||
test_expect_failure 'apply' '
|
||||
test_expect_success 'apply' '
|
||||
git apply diff
|
||||
'
|
||||
|
||||
|
Reference in New Issue
Block a user