t6300 (for-each-ref): clearly demarcate setup

Condense the two-step setup into one step, and give it an appropriate
name.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
index 752f5cb7d0f522a8a6654bae06b07a1727df7505..64301e7940b62c0b3fabdefec825cc76216fd17a 100755 (executable)
--- a/t/t6300-for-each-ref.sh
+++ b/t/t6300-for-each-ref.sh
@@ -18,16 +18,13 @@ setdate_and_increment () {
     export GIT_COMMITTER_DATE GIT_AUTHOR_DATE
 }
 
     export GIT_COMMITTER_DATE GIT_AUTHOR_DATE
 }
 

-test_expect_success 'Create sample commit with known timestamp' '
+test_expect_success setup '

        setdate_and_increment &&
        echo "Using $datestamp" > one &&
        git add one &&
        git commit -m "Initial" &&
        setdate_and_increment &&
        setdate_and_increment &&
        echo "Using $datestamp" > one &&
        git add one &&
        git commit -m "Initial" &&
        setdate_and_increment &&

-       git tag -a -m "Tagging at $datestamp" testtag
-'
-
-test_expect_success 'Create upstream config' '
+       git tag -a -m "Tagging at $datestamp" testtag &&

        git update-ref refs/remotes/origin/master master &&
        git remote add origin nowhere &&
        git config branch.master.remote origin &&
        git update-ref refs/remotes/origin/master master &&
        git remote add origin nowhere &&
        git config branch.master.remote origin &&