rev-parse test: use standard test functions for setup
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 <felipe.contreras@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Felipe Contreras committed
Sep 3, 2013 at 10:15 UTC
7495a17363de7397509710344e1c22f0918aceee
1 file changed
+9
-9
t/t6101-rev-parse-parents.sh
+9
-9
@@ -6,7 +6,6 @@
6
test_description='Test git rev-parse with different parent options'
7
8
. ./test-lib.sh
9
-. "$TEST_DIRECTORY"/lib-t6000.sh # t6xxx specific functions
9
10
test_cmp_rev_output () {
11
git rev-parse --verify "$1" >expect &&
@@ -14,14 +13,15 @@ test_cmp_rev_output () {
13
test_cmp expect actual
14
}
15
17
-date >path0
18
-git update-index --add path0
19
-save_tag tree git write-tree
20
-hide_error save_tag start unique_commit "start" tree
21
-save_tag second unique_commit "second" tree -p start
22
-hide_error save_tag start2 unique_commit "start2" tree
23
-save_tag two_parents unique_commit "next" tree -p second -p start2
24
-save_tag final unique_commit "final" tree -p two_parents
16
+test_expect_success 'setup' '
17
+ test_commit start &&
18
+ test_commit second &&
19
+ git checkout --orphan tmp &&
20
+ test_commit start2 &&
21
+ git checkout master &&
22
+ git merge -m next start2 &&
23
+ test_commit final
24
+'
25
26
test_expect_success 'start is valid' '
27
git rev-parse start | grep "^[0-9a-f]\{40\}$"