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>
Felipe Contreras committed
Oct 31, 2013 at 03:25 UTC
501a75a7b308ed9631cd4802d891e6b56c06821a
4 files changed
+4
-4
t/annotate-tests.sh
+1
-1
@@ -92,7 +92,7 @@ test_expect_success 'blame 2 authors + 1 branch2 author' '
92
'
93
94
test_expect_success 'merge branch1 & branch2' '
95
- git pull . branch1
95
+ git merge branch1
96
'
97
98
test_expect_success 'blame 2 authors + 2 merged-in authors' '
t/t4200-rerere.sh
+1
-1
@@ -172,7 +172,7 @@ test_expect_success 'first postimage wins' '
172
git show second^:a1 | sed "s/To die: t/To die! T/" >a1 &&
173
git commit -q -a -m third &&
174
175
- test_must_fail git pull . first &&
175
+ test_must_fail git merge first &&
176
# rerere kicked in
177
! grep "^=======\$" a1 &&
178
test_cmp expect a1
t/t9114-git-svn-dcommit-merge.sh
+1
-1
@@ -62,7 +62,7 @@ test_expect_success 'setup git mirror and merge' '
62
echo friend > README &&
63
cat tmp >> README &&
64
git commit -a -m "friend" &&
65
- git pull . merge
65
+ git merge merge
66
'
67
68
test_debug 'gitk --all & sleep 1'
t/t9500-gitweb-standalone-no-errors.sh
+1
-1
@@ -328,7 +328,7 @@ test_expect_success \
328
git add b &&
329
git commit -a -m "On branch" &&
330
git checkout master &&
331
- git pull . b &&
331
+ git merge b &&
332
git tag merge_commit'
333
334
test_expect_success \