summaryrefslogtreecommitdiff
path: root/t/t3404-rebase-interactive.sh
diff options
context:
space:
mode:
authorNanako Shiraishi <nanako3@lavabit.com>2008-09-03 17:59:27 +0900
committerJunio C Hamano <gitster@pobox.com>2008-09-03 12:41:46 -0700
commit0cb0e143ffa7d66b7feea0a967b3ac9ae6cd62b0 (patch)
treea190ecd0ca6dae9a32895793ff6c4c0341c2a8c9 /t/t3404-rebase-interactive.sh
parent7e44c93558e7c0b12624d76cf07753d0480ed96a (diff)
downloadgit-0cb0e143ffa7d66b7feea0a967b3ac9ae6cd62b0.tar.gz
tests: use "git xyzzy" form (t0000 - t3599)
Converts tests between t0050-t3903. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3404-rebase-interactive.sh')
-rwxr-xr-xt/t3404-rebase-interactive.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 5aa487ac02..e0ded197ec 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -161,7 +161,7 @@ test_expect_success 'stop on conflicting pick' '
test "$(git rev-parse HEAD~3)" = "$(git rev-parse master)" &&
test_cmp expect .git/rebase-merge/patch &&
test_cmp expect2 file1 &&
- test "$(git-diff --name-status |
+ test "$(git diff --name-status |
sed -n -e "/^U/s/^U[^a-z]*//p")" = file1 &&
test 4 = $(grep -v "^#" < .git/rebase-merge/done | wc -l) &&
test 0 = $(grep -c "^[^#]" < .git/rebase-merge/git-rebase-todo)