summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-07-28 19:23:28 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-07-28 19:23:28 (GMT)
commit5afa69b415fd020d6dd36751bdcf45fdbf07dd4a (patch)
treeb5b607987da1d965f6ce76d7fbe58f85cc0e3ac4 /t
parentab9f30fd7538ec5385bf5a3d11117f23f4f320ee (diff)
downloadgit-5afa69b415fd020d6dd36751bdcf45fdbf07dd4a.zip
git-5afa69b415fd020d6dd36751bdcf45fdbf07dd4a.tar.gz
git-5afa69b415fd020d6dd36751bdcf45fdbf07dd4a.tar.bz2
t4103: fix binary patch application test.
The generated binary patch was _not_ binary -- earlier I made the --full-index flag to imply binary patch generation to the diff machinery, but later we made it independent from --binary (although the latter implies the former). Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't')
-rwxr-xr-xt/t4103-apply-binary.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4103-apply-binary.sh b/t/t4103-apply-binary.sh
index 00bd8b1..ff05269 100755
--- a/t/t4103-apply-binary.sh
+++ b/t/t4103-apply-binary.sh
@@ -35,8 +35,8 @@ 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
+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