development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-25 10:45:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

t: replace pulls with merges

Browse source 
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:
Felipe Contreras 2013-10-31 03:25:33 -06:00 committed by Junio C Hamano
parent 90f867b9a5
commit 501a75a7b3
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
t/annotate-tests.sh
View file

@ -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' '

2
t/t4200-rerere.sh
View file

@ -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

2
t/t9114-git-svn-dcommit-merge.sh
View file

@ -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'

2
t/t9500-gitweb-standalone-no-errors.sh
View file

@ -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 \