diff options
| author | Eric Wong <normalperson@yhbt.net> | 2006-12-28 01:10:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-28 01:28:07 -0800 |
| commit | 7d2ba1229c87268e9ec953c18c747817fbbe34b7 (patch) | |
| tree | a376e93e407da40b4e612b6c0db7353862762bb8 /t/t6024-recursive-merge.sh | |
| parent | b11bd57a384a7bee21245d3895d77d20c33e4d78 (diff) | |
| download | git-7d2ba1229c87268e9ec953c18c747817fbbe34b7.tar.gz git-7d2ba1229c87268e9ec953c18c747817fbbe34b7.tar.xz | |
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>
Diffstat (limited to 't/t6024-recursive-merge.sh')
| -rw-r--r-- | t/t6024-recursive-merge.sh | 90 |
1 files changed, 47 insertions, 43 deletions
diff --git a/t/t6024-recursive-merge.sh b/t/t6024-recursive-merge.sh index 69b18f7d8..31b96257b 100644 --- a/t/t6024-recursive-merge.sh +++ b/t/t6024-recursive-merge.sh @@ -11,50 +11,54 @@ test_description='Test merge without common ancestors' # X \ # 2 - C - E - G -export GIT_COMMITTER_DATE="2006-12-12 23:28:00 +0100" -echo 1 > a1 -git add a1 -GIT_AUTHOR_DATE="2006-12-12 23:00:00" git commit -m 1 a1 - -git checkout -b A master -echo A > a1 -GIT_AUTHOR_DATE="2006-12-12 23:00:01" git commit -m A a1 - -git checkout -b B master -echo B > a1 -GIT_AUTHOR_DATE="2006-12-12 23:00:02" git commit -m B a1 - -git checkout -b D A -git-rev-parse B > .git/MERGE_HEAD -echo D > a1 -git update-index a1 -GIT_AUTHOR_DATE="2006-12-12 23:00:03" git commit -m D - -git symbolic-ref HEAD refs/heads/other -echo 2 > a1 -GIT_AUTHOR_DATE="2006-12-12 23:00:04" git commit -m 2 a1 - -git checkout -b C -echo C > a1 -GIT_AUTHOR_DATE="2006-12-12 23:00:05" git commit -m C a1 - -git checkout -b E C -git-rev-parse B > .git/MERGE_HEAD -echo E > a1 -git update-index a1 -GIT_AUTHOR_DATE="2006-12-12 23:00:06" git commit -m E - -git checkout -b G E -git-rev-parse A > .git/MERGE_HEAD -echo G > a1 -git update-index a1 -GIT_AUTHOR_DATE="2006-12-12 23:00:07" git commit -m G - -git checkout -b F D -git-rev-parse C > .git/MERGE_HEAD -echo F > a1 -git update-index a1 +GIT_COMMITTER_DATE="2006-12-12 23:28:00 +0100" +export GIT_COMMITTER_DATE + +test_expect_success "setup tests" ' +echo 1 > a1 && +git add a1 && +GIT_AUTHOR_DATE="2006-12-12 23:00:00" git commit -m 1 a1 && + +git checkout -b A master && +echo A > a1 && +GIT_AUTHOR_DATE="2006-12-12 23:00:01" git commit -m A a1 && + +git checkout -b B master && +echo B > a1 && +GIT_AUTHOR_DATE="2006-12-12 23:00:02" git commit -m B a1 && + +git checkout -b D A && +git-rev-parse B > .git/MERGE_HEAD && +echo D > a1 && +git update-index a1 && +GIT_AUTHOR_DATE="2006-12-12 23:00:03" git commit -m D && + +git symbolic-ref HEAD refs/heads/other && +echo 2 > a1 && +GIT_AUTHOR_DATE="2006-12-12 23:00:04" git commit -m 2 a1 && + +git checkout -b C && +echo C > a1 && +GIT_AUTHOR_DATE="2006-12-12 23:00:05" git commit -m C a1 && + +git checkout -b E C && +git-rev-parse B > .git/MERGE_HEAD && +echo E > a1 && +git update-index a1 && +GIT_AUTHOR_DATE="2006-12-12 23:00:06" git commit -m E && + +git checkout -b G E && +git-rev-parse A > .git/MERGE_HEAD && +echo G > a1 && +git update-index a1 && +GIT_AUTHOR_DATE="2006-12-12 23:00:07" git commit -m G && + +git checkout -b F D && +git-rev-parse C > .git/MERGE_HEAD && +echo F > a1 && +git update-index a1 && GIT_AUTHOR_DATE="2006-12-12 23:00:08" git commit -m F +' test_expect_failure "combined merge conflicts" "git merge -m final G" |