diff options
| author | Nanako Shiraishi <nanako3@lavabit.com> | 2008-09-03 17:59:27 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-03 12:41:46 -0700 |
| commit | 0cb0e143ffa7d66b7feea0a967b3ac9ae6cd62b0 (patch) | |
| tree | a190ecd0ca6dae9a32895793ff6c4c0341c2a8c9 /t/t3401-rebase-partial.sh | |
| parent | 7e44c93558e7c0b12624d76cf07753d0480ed96a (diff) | |
| download | git-0cb0e143ffa7d66b7feea0a967b3ac9ae6cd62b0.tar.gz git-0cb0e143ffa7d66b7feea0a967b3ac9ae6cd62b0.tar.xz | |
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/t3401-rebase-partial.sh')
| -rwxr-xr-x | t/t3401-rebase-partial.sh | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/t/t3401-rebase-partial.sh b/t/t3401-rebase-partial.sh index 166ddb144..aea668598 100755 --- a/t/t3401-rebase-partial.sh +++ b/t/t3401-rebase-partial.sh @@ -15,29 +15,29 @@ test_expect_success \ 'prepare repository with topic branch' \ 'echo First > A && git update-index --add A && - git-commit -m "Add A." && + git commit -m "Add A." && - git-checkout -b my-topic-branch && + git checkout -b my-topic-branch && echo Second > B && git update-index --add B && - git-commit -m "Add B." && + git commit -m "Add B." && echo AnotherSecond > C && git update-index --add C && - git-commit -m "Add C." && + git commit -m "Add C." && - git-checkout -f master && + git checkout -f master && echo Third >> A && git update-index A && - git-commit -m "Modify A." + git commit -m "Modify A." ' test_expect_success \ 'pick top patch from topic branch into master' \ 'git cherry-pick my-topic-branch^0 && - git-checkout -f my-topic-branch && + git checkout -f my-topic-branch && git branch master-merge master && git branch my-topic-branch-merge my-topic-branch ' @@ -49,13 +49,13 @@ test_debug \ ' test_expect_success \ - 'rebase topic branch against new master and check git-am did not get halted' \ - 'git-rebase master && test ! -d .git/rebase-apply' + 'rebase topic branch against new master and check git am did not get halted' \ + 'git rebase master && test ! -d .git/rebase-apply' test_expect_success \ 'rebase --merge topic branch that was partially merged upstream' \ - 'git-checkout -f my-topic-branch-merge && - git-rebase --merge master-merge && + 'git checkout -f my-topic-branch-merge && + git rebase --merge master-merge && test ! -d .git/rebase-merge' test_done |