aboutsummaryrefslogtreecommitdiff
path: root/t/t4121-apply-diffs.sh
diff options
context:
space:
mode:
authorAlex Riesen <raa.lkml@gmail.com>2007-04-18 23:58:56 +0200
committerJunio C Hamano <junkio@cox.net>2007-04-18 15:33:01 -0700
commit0afa7644f2f3543a033d327468ab97d7581f9d13 (patch)
tree748ede4d976236df8f107ace5138c582d76611c7 /t/t4121-apply-diffs.sh
parent0c1ec5a1f769021ebe96dfff493c561921dbba52 (diff)
downloadgit-0afa7644f2f3543a033d327468ab97d7581f9d13.tar.gz
git-0afa7644f2f3543a033d327468ab97d7581f9d13.tar.xz
Fix overwriting of files when applying contextually independent diffs
Noticed by applying two diffs of different contexts to the same file. The check for existence of a file was wrong: the test assumed it was a directory and reset the errno (twice: directly and by calling lstat). So if an entry existed and was _not_ a directory no attempt was made to rename into it, because the errno (expected by renaming code) was already reset to 0. This resulted in error: fatal: unable to write file file mode 100644 For Linux, removing "errno = 0" is enough, as lstat wont modify errno if it was successful. The behavior should not be depended upon, though, so modify the "if" as well. The test simulates this situation. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t4121-apply-diffs.sh')
-rwxr-xr-xt/t4121-apply-diffs.sh33
1 files changed, 33 insertions, 0 deletions
diff --git a/t/t4121-apply-diffs.sh b/t/t4121-apply-diffs.sh
new file mode 100755
index 000000000..2b2f1eda2
--- /dev/null
+++ b/t/t4121-apply-diffs.sh
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+test_description='git-apply for contextually independent diffs'
+. ./test-lib.sh
+
+echo '1
+2
+3
+4
+5
+6
+7
+8' >file
+
+test_expect_success 'setup' \
+ 'git add file &&
+ git commit -q -m 1 &&
+ git checkout -b test &&
+ mv file file.tmp &&
+ echo 0 >file &&
+ cat file.tmp >>file &&
+ rm file.tmp &&
+ git commit -a -q -m 2 &&
+ echo 9 >>file &&
+ git commit -a -q -m 3 &&
+ git checkout master'
+
+test_expect_success \
+ 'check if contextually independent diffs for the same file apply' \
+ '( git diff test~2 test~1; git diff test~1 test~0 )| git apply'
+
+test_done
+