git-add--interactive: manual hunk editing mode

[git.git] / t / t4012-diff-binary.sh

diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh
index bdd95c0d3dd8e4a5986ddfc6ac9e68abc69c971b..eced1f30fb8475739aef52230bbb79946a0f76d8 100755 (executable)
--- a/t/t4012-diff-binary.sh
+++ b/t/t4012-diff-binary.sh
@@ -10,37 +10,32 @@ test_description='Binary diff and apply
 
 test_expect_success 'prepare repository' \
        'echo AIT >a && echo BIT >b && echo CIT >c && echo DIT >d &&
-        git-update-index --add a b c d &&
+        git update-index --add a b c d &&
         echo git >a &&
         cat ../test4012.png >b &&
         echo git >c &&
         cat b b >d'
 
-test_expect_success 'diff without --binary' \
-       'git-diff | git-apply --stat --summary >current &&
-        cmp current - <<\EOF
+cat > expected <<\EOF
  a |    2 +-
  b |  Bin
  c |    2 +-
  d |  Bin
  4 files changed, 2 insertions(+), 2 deletions(-)
-EOF'
+EOF
+test_expect_success 'diff without --binary' \
+       'git diff | git apply --stat --summary >current &&
+        cmp current expected'
 
 test_expect_success 'diff with --binary' \
-       'git-diff --binary | git-apply --stat --summary >current &&
-        cmp current - <<\EOF
- a |    2 +-
- b |  Bin
- c |    2 +-
- d |  Bin
- 4 files changed, 2 insertions(+), 2 deletions(-)
-EOF'
+       'git diff --binary | git apply --stat --summary >current &&
+        cmp current expected'
 
 # apply needs to be able to skip the binary material correctly
 # in order to report the line number of a corrupt patch.
 test_expect_success 'apply detecting corrupt patch correctly' \
-       'git-diff | sed -e 's/-CIT/xCIT/' >broken &&
-        if git-apply --stat --summary broken 2>detected
+       'git diff | sed -e 's/-CIT/xCIT/' >broken &&
+        if git apply --stat --summary broken 2>detected
         then
                echo unhappy - should have detected an error
                (exit 1)
@@ -53,8 +48,8 @@ test_expect_success 'apply detecting corrupt patch correctly' \
         test "$detected" = xCIT'
 
 test_expect_success 'apply detecting corrupt patch correctly' \
-       'git-diff --binary | sed -e 's/-CIT/xCIT/' >broken &&
-        if git-apply --stat --summary broken 2>detected
+       'git diff --binary | sed -e 's/-CIT/xCIT/' >broken &&
+        if git apply --stat --summary broken 2>detected
         then
                echo unhappy - should have detected an error
                (exit 1)
@@ -71,15 +66,15 @@ 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' \
        'echo AIT >a && mv b e && echo CIT >c && cat e >d &&
-        git-update-index --add --remove a b c d e &&
-        tree0=`git-write-tree` &&
-        git-diff --cached --binary >current &&
-        git-apply --stat --summary current'
+        git update-index --add --remove a b c d e &&
+        tree0=`git write-tree` &&
+        git diff --cached --binary >current &&
+        git apply --stat --summary current'
 
 test_expect_success 'apply binary patch' \
        'git-reset --hard &&
-        git-apply --binary --index <current &&
-        tree1=`git-write-tree` &&
+        git apply --binary --index <current &&
+        tree1=`git write-tree` &&
         test "$tree1" = "$tree0"'
 
 test_done