summaryrefslogtreecommitdiff
path: root/t/t4012-diff-binary.sh
diff options
context:
space:
mode:
authorNanako Shiraishi <nanako3@lavabit.com>2008-09-03 08:59:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-09-03 21:13:59 (GMT)
commit3604e7c5c6f8d48e221ea5b21ef26fc3e27eff9e (patch)
treeb7fc41aa5f6e13fd411ecb212921a72b1d0d1684 /t/t4012-diff-binary.sh
parent0cb0e143ffa7d66b7feea0a967b3ac9ae6cd62b0 (diff)
downloadgit-3604e7c5c6f8d48e221ea5b21ef26fc3e27eff9e.zip
git-3604e7c5c6f8d48e221ea5b21ef26fc3e27eff9e.tar.gz
git-3604e7c5c6f8d48e221ea5b21ef26fc3e27eff9e.tar.bz2
tests: use "git xyzzy" form (t3600 - t6999)
Converts tests between t3600-t6300. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4012-diff-binary.sh')
-rwxr-xr-xt/t4012-diff-binary.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh
index eced1f3..64c372a 100755
--- a/t/t4012-diff-binary.sh
+++ b/t/t4012-diff-binary.sh
@@ -61,7 +61,7 @@ test_expect_success 'apply detecting corrupt patch correctly' \
detected=`sed -ne "${detected}p" broken` &&
test "$detected" = xCIT'
-test_expect_success 'initial commit' 'git-commit -a -m initial'
+test_expect_success 'initial commit' 'git commit -a -m initial'
# Try removal (b), modification (d), and creation (e).
test_expect_success 'diff-index with --binary' \
@@ -72,7 +72,7 @@ test_expect_success 'diff-index with --binary' \
git apply --stat --summary current'
test_expect_success 'apply binary patch' \
- 'git-reset --hard &&
+ 'git reset --hard &&
git apply --binary --index <current &&
tree1=`git write-tree` &&
test "$tree1" = "$tree0"'