aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorMichał Kiedrowicz <michal.kiedrowicz@gmail.com>2009-04-11 21:31:00 +0200
committerJunio C Hamano <gitster@pobox.com>2009-04-20 13:46:58 -0700
commite8141fcf54b4e8c2c12300da1ad1bc3573a4e204 (patch)
tree1df098f9353e26a422897ff01741ff91f6afeadb /t
parent1d49f0d1a1b7b2941e56cf8384a7a4267e98150c (diff)
downloadgit-e8141fcf54b4e8c2c12300da1ad1bc3573a4e204.tar.gz
git-e8141fcf54b4e8c2c12300da1ad1bc3573a4e204.tar.xz
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-xt/t4130-apply-criss-cross-rename.sh2
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 08c5f38b0..8623dbeba 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
'