diff options
| author | Michał Kiedrowicz <michal.kiedrowicz@gmail.com> | 2009-04-11 23:31:00 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-16 04:47:55 +0400 |
| commit | 7fac0eef91cf930ef827b00934701fa5543dce76 (patch) | |
| tree | 7f3c60cd58be366a3f8e6440b9b574d6927f8f3a /t | |
| parent | d8c81dfcaf3ac4bab0f0f8f54d2c4ae0425abcbf (diff) | |
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>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4130-apply-criss-cross-rename.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4130-apply-criss-cross-rename.sh b/t/t4130-apply-criss-cross-rename.sh index 08c5f38b01..8623dbebab 100755 --- a/t/t4130-apply-criss-cross-rename.sh +++ b/t/t4130-apply-criss-cross-rename.sh @@ -31,7 +31,7 @@ test_expect_success 'diff -M -B' ' ' -test_expect_failure 'apply' ' +test_expect_success 'apply' ' git apply diff ' |