kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

t7600 (merge): test merge from branch yet to be born 

Some people like to "git fetch origin && merge origin/master" from
the unborn branch provided when first initializing a repository.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jonathan Nieder 2010-08-17 01:56:46 -05:00 committed by Junio C Hamano
parent ff372c7851
commit 94d63ce2ab
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
t/t7600-merge.sh
View File

@ -173,6 +173,27 @@ test_expect_success 'merge c0 with c1 with --ff-only' '

test_debug 'git log --graph --decorate --oneline --all'

test_expect_success 'merge from unborn branch' '
git checkout -f master &&
test_might_fail git branch -D kid &&

echo "OBJID HEAD@{0}: initial pull" >reflog.expected &&

git checkout --orphan kid &&
test_when_finished "git checkout -f master" &&
git rm -fr . &&
test_tick &&
git merge --ff-only c1 &&
verify_merge file result.1 &&
verify_head "$c1" &&

git reflog -1 >reflog.actual &&
sed "s/$_x05[0-9a-f][0-9a-f]/OBJID/g" reflog.actual >reflog.fuzzy &&
test_cmp reflog.expected reflog.fuzzy
'

test_debug 'git log --graph --decorate --oneline --all'

test_expect_success 'merge c1 with c2' '
git reset --hard c1 &&
test_tick &&