t6024-recursive-merge: quiet down this test
We get an extra measure of error checking here as well. While we're at it, also removed a less portable use of export. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong committed
Dec 28, 2006 at 01:10 UTC
7d2ba1229c87268e9ec953c18c747817fbbe34b7
1 file changed
+47
-43
t/t6024-recursive-merge.sh
+47
-43
@@ -11,50 +11,54 @@ test_description='Test merge without common ancestors'
11
# X \
12
# 2 - C - E - G
13
14
-export GIT_COMMITTER_DATE="2006-12-12 23:28:00 +0100"
15
-echo 1 > a1
16
-git add a1
17
-GIT_AUTHOR_DATE="2006-12-12 23:00:00" git commit -m 1 a1
18
-
19
-git checkout -b A master
20
-echo A > a1
21
-GIT_AUTHOR_DATE="2006-12-12 23:00:01" git commit -m A a1
22
-
23
-git checkout -b B master
24
-echo B > a1
25
-GIT_AUTHOR_DATE="2006-12-12 23:00:02" git commit -m B a1
26
-
27
-git checkout -b D A
28
-git-rev-parse B > .git/MERGE_HEAD
29
-echo D > a1
30
-git update-index a1
31
-GIT_AUTHOR_DATE="2006-12-12 23:00:03" git commit -m D
32
-
33
-git symbolic-ref HEAD refs/heads/other
34
-echo 2 > a1
35
-GIT_AUTHOR_DATE="2006-12-12 23:00:04" git commit -m 2 a1
36
-
37
-git checkout -b C
38
-echo C > a1
39
-GIT_AUTHOR_DATE="2006-12-12 23:00:05" git commit -m C a1
40
-
41
-git checkout -b E C
42
-git-rev-parse B > .git/MERGE_HEAD
43
-echo E > a1
44
-git update-index a1
45
-GIT_AUTHOR_DATE="2006-12-12 23:00:06" git commit -m E
46
-
47
-git checkout -b G E
48
-git-rev-parse A > .git/MERGE_HEAD
49
-echo G > a1
50
-git update-index a1
51
-GIT_AUTHOR_DATE="2006-12-12 23:00:07" git commit -m G
52
-
53
-git checkout -b F D
54
-git-rev-parse C > .git/MERGE_HEAD
55
-echo F > a1
56
-git update-index a1
14
+GIT_COMMITTER_DATE="2006-12-12 23:28:00 +0100"
15
+export GIT_COMMITTER_DATE
16
+
17
+test_expect_success "setup tests" '
18
+echo 1 > a1 &&
19
+git add a1 &&
20
+GIT_AUTHOR_DATE="2006-12-12 23:00:00" git commit -m 1 a1 &&
21
+
22
+git checkout -b A master &&
23
+echo A > a1 &&
24
+GIT_AUTHOR_DATE="2006-12-12 23:00:01" git commit -m A a1 &&
25
+
26
+git checkout -b B master &&
27
+echo B > a1 &&
28
+GIT_AUTHOR_DATE="2006-12-12 23:00:02" git commit -m B a1 &&
29
+
30
+git checkout -b D A &&
31
+git-rev-parse B > .git/MERGE_HEAD &&
32
+echo D > a1 &&
33
+git update-index a1 &&
34
+GIT_AUTHOR_DATE="2006-12-12 23:00:03" git commit -m D &&
35
+
36
+git symbolic-ref HEAD refs/heads/other &&
37
+echo 2 > a1 &&
38
+GIT_AUTHOR_DATE="2006-12-12 23:00:04" git commit -m 2 a1 &&
39
+
40
+git checkout -b C &&
41
+echo C > a1 &&
42
+GIT_AUTHOR_DATE="2006-12-12 23:00:05" git commit -m C a1 &&
43
+
44
+git checkout -b E C &&
45
+git-rev-parse B > .git/MERGE_HEAD &&
46
+echo E > a1 &&
47
+git update-index a1 &&
48
+GIT_AUTHOR_DATE="2006-12-12 23:00:06" git commit -m E &&
49
+
50
+git checkout -b G E &&
51
+git-rev-parse A > .git/MERGE_HEAD &&
52
+echo G > a1 &&
53
+git update-index a1 &&
54
+GIT_AUTHOR_DATE="2006-12-12 23:00:07" git commit -m G &&
55
+
56
+git checkout -b F D &&
57
+git-rev-parse C > .git/MERGE_HEAD &&
58
+echo F > a1 &&
59
+git update-index a1 &&
60
GIT_AUTHOR_DATE="2006-12-12 23:00:08" git commit -m F
61
+'
62
63
test_expect_failure "combined merge conflicts" "git merge -m final G"
64