From: Felipe Contreras <>

Save the reader from learning specialized t6* setup functions
where familiar commands like test_commit, "git checkout --orphan",
and "git merge" will do.

While at it, wrap the setup commands in a test assertion so errors can
be caught and stray output suppressed when running without --verbose
as in other tests.

Signed-off-by: Felipe Contreras <>
Signed-off-by: Jonathan Nieder <>
Thanks for reading.

 t/ | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/t/ b/t/
index 8a6ff66..b5fa9e4 100755
--- a/t/
+++ b/t/
@@ -14,14 +14,15 @@ test_cmp_rev_output () {
        test_cmp expect actual
-date >path0
-git update-index --add path0
-save_tag tree git write-tree
-hide_error save_tag start unique_commit "start" tree
-save_tag second unique_commit "second" tree -p start
-hide_error save_tag start2 unique_commit "start2" tree
-save_tag two_parents unique_commit "next" tree -p second -p start2
-save_tag final unique_commit "final" tree -p two_parents
+test_expect_success 'setup' '
+       test_commit start &&
+       test_commit second &&
+       git checkout --orphan tmp &&
+       test_commit start2 &&
+       git checkout master &&
+       git merge -m next start2 &&
+       test_commit final
 test_expect_success 'start is valid' '
        git rev-parse start | grep "^[0-9a-f]\{40\}$"

To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to
More majordomo info at

Reply via email to