mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
t: replace pulls with merges
This is what the code intended. No functional changes. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
90f867b9a5
commit
501a75a7b3
|
@ -92,7 +92,7 @@ test_expect_success 'blame 2 authors + 1 branch2 author' '
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'merge branch1 & branch2' '
|
test_expect_success 'merge branch1 & branch2' '
|
||||||
git pull . branch1
|
git merge branch1
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'blame 2 authors + 2 merged-in authors' '
|
test_expect_success 'blame 2 authors + 2 merged-in authors' '
|
||||||
|
|
|
@ -172,7 +172,7 @@ test_expect_success 'first postimage wins' '
|
||||||
git show second^:a1 | sed "s/To die: t/To die! T/" >a1 &&
|
git show second^:a1 | sed "s/To die: t/To die! T/" >a1 &&
|
||||||
git commit -q -a -m third &&
|
git commit -q -a -m third &&
|
||||||
|
|
||||||
test_must_fail git pull . first &&
|
test_must_fail git merge first &&
|
||||||
# rerere kicked in
|
# rerere kicked in
|
||||||
! grep "^=======\$" a1 &&
|
! grep "^=======\$" a1 &&
|
||||||
test_cmp expect a1
|
test_cmp expect a1
|
||||||
|
|
|
@ -62,7 +62,7 @@ test_expect_success 'setup git mirror and merge' '
|
||||||
echo friend > README &&
|
echo friend > README &&
|
||||||
cat tmp >> README &&
|
cat tmp >> README &&
|
||||||
git commit -a -m "friend" &&
|
git commit -a -m "friend" &&
|
||||||
git pull . merge
|
git merge merge
|
||||||
'
|
'
|
||||||
|
|
||||||
test_debug 'gitk --all & sleep 1'
|
test_debug 'gitk --all & sleep 1'
|
||||||
|
|
|
@ -328,7 +328,7 @@ test_expect_success \
|
||||||
git add b &&
|
git add b &&
|
||||||
git commit -a -m "On branch" &&
|
git commit -a -m "On branch" &&
|
||||||
git checkout master &&
|
git checkout master &&
|
||||||
git pull . b &&
|
git merge b &&
|
||||||
git tag merge_commit'
|
git tag merge_commit'
|
||||||
|
|
||||||
test_expect_success \
|
test_expect_success \
|
||||||
|
|
Loading…
Reference in a new issue