mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t6024-recursive-merge: quiet down this test

Browse Source 
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>
This commit is contained in:
Eric Wong
2006-12-28 01:10:50 -08:00
committed by Junio C Hamano
parent b11bd57a38
commit 7d2ba1229c
1 changed files with 39 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
t/t6024-recursive-merge.sh
View File

@ -11,50 +11,54 @@ test_description='Test merge without common ancestors'
# X \ # X \
# 2 - C - E - G # 2 - C - E - G
export GIT_COMMITTER_DATE="2006-12-12 23:28:00 +0100" GIT_COMMITTER_DATE="2006-12-12 23:28:00 +0100"
echo 1 > a1 export GIT_COMMITTER_DATE
git add a1
GIT_AUTHOR_DATE="2006-12-12 23:00:00" git commit -m 1 a1
git checkout -b A master test_expect_success "setup tests" '
echo A > a1 echo 1 > a1 &&
GIT_AUTHOR_DATE="2006-12-12 23:00:01" git commit -m A a1 git add a1 &&
GIT_AUTHOR_DATE="2006-12-12 23:00:00" git commit -m 1 a1 &&
git checkout -b B master git checkout -b A master &&
echo B > a1 echo A > a1 &&
GIT_AUTHOR_DATE="2006-12-12 23:00:02" git commit -m B a1 GIT_AUTHOR_DATE="2006-12-12 23:00:01" git commit -m A a1 &&
git checkout -b D A git checkout -b B master &&
git-rev-parse B > .git/MERGE_HEAD echo B > a1 &&
echo D > a1 GIT_AUTHOR_DATE="2006-12-12 23:00:02" git commit -m B 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 git checkout -b D A &&
echo 2 > a1 git-rev-parse B > .git/MERGE_HEAD &&
GIT_AUTHOR_DATE="2006-12-12 23:00:04" git commit -m 2 a1 echo D > a1 &&
git update-index a1 &&
GIT_AUTHOR_DATE="2006-12-12 23:00:03" git commit -m D &&
git checkout -b C git symbolic-ref HEAD refs/heads/other &&
echo C > a1 echo 2 > a1 &&
GIT_AUTHOR_DATE="2006-12-12 23:00:05" git commit -m C a1 GIT_AUTHOR_DATE="2006-12-12 23:00:04" git commit -m 2 a1 &&
git checkout -b E C git checkout -b C &&
git-rev-parse B > .git/MERGE_HEAD echo C > a1 &&
echo E > a1 GIT_AUTHOR_DATE="2006-12-12 23:00:05" git commit -m C a1 &&
git update-index a1
GIT_AUTHOR_DATE="2006-12-12 23:00:06" git commit -m E
git checkout -b G E git checkout -b E C &&
git-rev-parse A > .git/MERGE_HEAD git-rev-parse B > .git/MERGE_HEAD &&
echo G > a1 echo E > a1 &&
git update-index a1 git update-index a1 &&
GIT_AUTHOR_DATE="2006-12-12 23:00:07" git commit -m G GIT_AUTHOR_DATE="2006-12-12 23:00:06" git commit -m E &&
git checkout -b F D git checkout -b G E &&
git-rev-parse C > .git/MERGE_HEAD git-rev-parse A > .git/MERGE_HEAD &&
echo F > a1 echo G > a1 &&
git update-index 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 GIT_AUTHOR_DATE="2006-12-12 23:00:08" git commit -m F
'
test_expect_failure "combined merge conflicts" "git merge -m final G" test_expect_failure "combined merge conflicts" "git merge -m final G"