summaryrefslogtreecommitdiff
path: root/t/t4103-apply-binary.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-07-02 22:52:14 -0700
committerJunio C Hamano <gitster@pobox.com>2007-07-02 22:52:14 -0700
commit5be60078c935ed08ee8eb5a32680bdfb6bb5bdf3 (patch)
tree9f68d81a31f8dfe7af6096e7beac2dc0997c143a /t/t4103-apply-binary.sh
parent36e5e70e0f40cf7ca4351b8159d68f8560a2805f (diff)
downloadgit-5be60078c935ed08ee8eb5a32680bdfb6bb5bdf3.tar.gz
Rewrite "git-frotz" to "git frotz"
This uses the remove-dashes target to replace "git-frotz" to "git frotz". Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4103-apply-binary.sh')
-rwxr-xr-xt/t4103-apply-binary.sh52
1 files changed, 26 insertions, 26 deletions
diff --git a/t/t4103-apply-binary.sh b/t/t4103-apply-binary.sh
index e2b1124c78..011126f336 100755
--- a/t/t4103-apply-binary.sh
+++ b/t/t4103-apply-binary.sh
@@ -3,7 +3,7 @@
# Copyright (c) 2005 Junio C Hamano
#
-test_description='git-apply handling binary patches
+test_description='git apply handling binary patches
'
. ./test-lib.sh
@@ -20,55 +20,55 @@ EOF
cat file1 >file2
cat file1 >file4
-git-update-index --add --remove file1 file2 file4
+git update-index --add --remove file1 file2 file4
git-commit -m 'Initial Version' 2>/dev/null
git-checkout -b binary
tr 'x' '\0' <file1 >file3
cat file3 >file4
-git-add file2
+git add file2
tr '\0' 'v' <file3 >file1
rm -f file2
-git-update-index --add --remove file1 file2 file3 file4
+git update-index --add --remove file1 file2 file3 file4
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 master binary >B.diff
+git diff-tree -p -C master binary >C.diff
-git-diff-tree -p --binary master binary >BF.diff
-git-diff-tree -p --binary -C master binary >CF.diff
+git diff-tree -p --binary master binary >BF.diff
+git diff-tree -p --binary -C master binary >CF.diff
test_expect_success 'stat binary diff -- should not fail.' \
'git-checkout master
- git-apply --stat --summary B.diff'
+ git apply --stat --summary B.diff'
test_expect_success 'stat binary diff (copy) -- should not fail.' \
'git-checkout master
- git-apply --stat --summary C.diff'
+ git apply --stat --summary C.diff'
test_expect_failure 'check binary diff -- should fail.' \
'git-checkout master
- git-apply --check B.diff'
+ git apply --check B.diff'
test_expect_failure 'check binary diff (copy) -- should fail.' \
'git-checkout master
- git-apply --check C.diff'
+ git apply --check C.diff'
test_expect_failure 'check incomplete binary diff with replacement -- should fail.' \
'git-checkout master
- git-apply --check --allow-binary-replacement B.diff'
+ git apply --check --allow-binary-replacement B.diff'
test_expect_failure 'check incomplete binary diff with replacement (copy) -- should fail.' \
'git-checkout master
- git-apply --check --allow-binary-replacement C.diff'
+ 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'
+ 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'
+ git apply --check --allow-binary-replacement CF.diff'
# Now we start applying them.
@@ -80,36 +80,36 @@ do_reset () {
test_expect_failure 'apply binary diff -- should fail.' \
'do_reset
- git-apply B.diff'
+ git apply B.diff'
test_expect_failure 'apply binary diff -- should fail.' \
'do_reset
- git-apply --index B.diff'
+ git apply --index B.diff'
test_expect_failure 'apply binary diff (copy) -- should fail.' \
'do_reset
- git-apply C.diff'
+ git apply C.diff'
test_expect_failure 'apply binary diff (copy) -- should fail.' \
'do_reset
- git-apply --index C.diff'
+ git apply --index C.diff'
test_expect_success 'apply binary diff without replacement.' \
'do_reset
- git-apply BF.diff'
+ git apply BF.diff'
test_expect_success 'apply binary diff without replacement (copy).' \
'do_reset
- git-apply CF.diff'
+ 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)"'
+ 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)"'
+ git apply --allow-binary-replacement --index CF.diff &&
+ test -z "$(git diff --name-status binary)"'
test_done