From: Felipe Contreras Date: Sun, 09 Jun 2013 16:40:55 GMT Subject: [PATCH v4 43/45] t3406: modernize style Message-ID: <1370796057-25312-44-git-send-email-felipe.contreras@gmail.com> In-Reply-To: <1370796057-25312-1-git-send-email-felipe.contreras@gmail.com> From: Martin von Zweigbergk Update the following: - Quote 'setup' - Remove blank lines within test case body - Use test_commit instead of custom quick_one - Create branch "topic" from tag created by test_commit Signed-off-by: Martin von Zweigbergk Signed-off-by: Junio C Hamano Conflicts: t/t3406-rebase-message.sh --- t/t3406-rebase-message.sh | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/t/t3406-rebase-message.sh b/t/t3406-rebase-message.sh index 37d19c5..7f48d0f 100755 --- a/t/t3406-rebase-message.sh +++ b/t/t3406-rebase-message.sh @@ -4,27 +4,17 @@ test_description='messages from rebase operation' . ./test-lib.sh -quick_one () { - echo "$1" >"file$1" && - git add "file$1" && - test_tick && - git commit -m "$1" -} - -test_expect_success setup ' - quick_one O && - git branch topic && - quick_one X && - quick_one A && - quick_one B && - quick_one Y && - - git checkout topic && - quick_one A && - quick_one B && - quick_one Z && +test_expect_success 'setup' ' + test_commit O fileO && + test_commit X fileX && + test_commit A fileA && + test_commit B fileB && + test_commit Y fileY && + + git checkout -b topic O && + git cherry-pick A B && + test_commit Z fileZ && git tag start - ' test_expect_success 'rebase --stat' ' -- 1.8.3.698.g079b096