diff options
Diffstat (limited to 't/t3401-rebase-partial.sh')
-rwxr-xr-x | t/t3401-rebase-partial.sh | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/t/t3401-rebase-partial.sh b/t/t3401-rebase-partial.sh index 8b19d3ccea..aea6685984 100755 --- a/t/t3401-rebase-partial.sh +++ b/t/t3401-rebase-partial.sh @@ -14,48 +14,48 @@ local branch. test_expect_success \ 'prepare repository with topic branch' \ 'echo First > A && - git-update-index --add A && - git-commit -m "Add A." && + git update-index --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 update-index --add B && + git commit -m "Add B." && echo AnotherSecond > C && - git-update-index --add C && - git-commit -m "Add C." && + git update-index --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 update-index 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-branch master-merge master && - git-branch my-topic-branch-merge my-topic-branch + 'git cherry-pick my-topic-branch^0 && + git checkout -f my-topic-branch && + git branch master-merge master && + git branch my-topic-branch-merge my-topic-branch ' test_debug \ - 'git-cherry master && - git-format-patch -k --stdout --full-index master >/dev/null && + 'git cherry master && + git format-patch -k --stdout --full-index master >/dev/null && gitk --all & sleep 1 ' test_expect_success \ - 'rebase topic branch against new master and check git-am did not get halted' \ - 'git-rebase master && test ! -d .dotest' + '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 && - test ! -d .git/.dotest-merge' + 'git checkout -f my-topic-branch-merge && + git rebase --merge master-merge && + test ! -d .git/rebase-merge' test_done |