summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-16 23:52:45 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-17 00:20:41 (GMT)
commitfbba222f5de21aafa566430a8ae7cf6f4ab163b1 (patch)
treee49bb7529fb3b4a3abc2a834ae4513558bbb8fdd /t
parent80b1e511d74ac2942043f912d850cb6b85b44689 (diff)
downloadgit-fbba222f5de21aafa566430a8ae7cf6f4ab163b1.zip
git-fbba222f5de21aafa566430a8ae7cf6f4ab163b1.tar.gz
git-fbba222f5de21aafa566430a8ae7cf6f4ab163b1.tar.bz2
tests: binary diff application.
This adds more tests to cover cases where binary diff application succeeds. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't')
-rw-r--r--t/t4103-apply-binary.sh49
1 files changed, 39 insertions, 10 deletions
diff --git a/t/t4103-apply-binary.sh b/t/t4103-apply-binary.sh
index 9057f6d..00bd8b1 100644
--- a/t/t4103-apply-binary.sh
+++ b/t/t4103-apply-binary.sh
@@ -35,6 +35,9 @@ git-commit -m 'Second Version'
git-diff-tree -p master binary >B.diff
git-diff-tree -p -C master binary >C.diff
+git-diff-tree -p --full-index master binary >BF.diff
+git-diff-tree -p --full-index -C master binary >CF.diff
+
test_expect_success 'stat binary diff -- should not fail.' \
'git-checkout master
git-apply --stat --summary B.diff'
@@ -59,28 +62,54 @@ test_expect_failure 'check incomplete binary diff with replacement (copy) -- sho
'git-checkout master
git-apply --check --allow-binary-replacement C.diff'
+test_expect_success 'check binary diff with replacement.' \
+ 'git-checkout master
+ git-apply --check --allow-binary-replacement BF.diff'
+
+test_expect_success 'check binary diff with replacement (copy).' \
+ 'git-checkout master
+ git-apply --check --allow-binary-replacement CF.diff'
+
# Now we start applying them.
+do_reset () {
+ rm -f file?
+ git-reset --hard
+ git-checkout -f master
+}
+
test_expect_failure 'apply binary diff -- should fail.' \
- 'git-checkout master
+ 'do_reset
git-apply B.diff'
-git-reset --hard
-
test_expect_failure 'apply binary diff -- should fail.' \
- 'git-checkout master
+ 'do_reset
git-apply --index B.diff'
-git-reset --hard
-
test_expect_failure 'apply binary diff (copy) -- should fail.' \
- 'git-checkout master
+ 'do_reset
git-apply C.diff'
-git-reset --hard
-
test_expect_failure 'apply binary diff (copy) -- should fail.' \
- 'git-checkout master
+ 'do_reset
git-apply --index C.diff'
+test_expect_failure 'apply binary diff without replacement -- should fail.' \
+ 'do_reset
+ git-apply BF.diff'
+
+test_expect_failure 'apply binary diff without replacement (copy) -- should fail.' \
+ 'do_reset
+ git-apply CF.diff'
+
+test_expect_success 'apply binary diff.' \
+ 'do_reset
+ git-apply --allow-binary-replacement --index BF.diff &&
+ test -z "$(git-diff --name-status binary)"'
+
+test_expect_success 'apply binary diff (copy).' \
+ 'do_reset
+ git-apply --allow-binary-replacement --index CF.diff &&
+ test -z "$(git-diff --name-status binary)"'
+
test_done