Simplify t3401 by using test_commit in the setup. This lets us refer to commits using their tags and there is no longer a need to create the branch my-topic-branch-merge. Also, the branch master-merge points to the same commit as master (even before this change), so that branch does not need to be created either. Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@xxxxxxxxx> --- t/t3401-rebase-partial.sh | 31 ++++++++----------------------- 1 files changed, 8 insertions(+), 23 deletions(-) diff --git a/t/t3401-rebase-partial.sh b/t/t3401-rebase-partial.sh index d7c874c..1aac22c 100755 --- a/t/t3401-rebase-partial.sh +++ b/t/t3401-rebase-partial.sh @@ -12,32 +12,17 @@ local branch. . ./test-lib.sh test_expect_success 'prepare repository with topic branch' ' - echo First > A && - git update-index --add A && - git commit -m "Add A." && - + test_commit A && git checkout -b my-topic-branch && - - echo Second > B && - git update-index --add B && - git commit -m "Add B." && - - echo AnotherSecond > C && - git update-index --add C && - git commit -m "Add C." && - + test_commit B && + test_commit C && git checkout -f master && - - echo Third >> A && - git update-index A && - git commit -m "Modify A." + test_commit A2 A.t ' 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 C && + git checkout -f my-topic-branch ' test_debug ' @@ -52,8 +37,8 @@ test_expect_success 'rebase topic branch against new master and check git am did ' 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 reset --hard C && + git rebase --merge master && test ! -d .git/rebase-merge ' -- 1.7.8.237.gcc4e3 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html