* [PATCH] test: diff: use merge instead of pull
@ 2021-07-22 0:04 Felipe Contreras
0 siblings, 0 replies; only message in thread
From: Felipe Contreras @ 2021-07-22 0:04 UTC (permalink / raw)
To: git; +Cc: Alex Henrie, Elijah Newren, Felipe Contreras
No need to call `git pull --merge .` when `git merge` suffices.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
t/t4013-diff-various.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index 7fadc985cc..447cf269da 100755
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -65,7 +65,7 @@ test_expect_success setup '
export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
git checkout master &&
- git pull -s ours . side &&
+ git merge -s ours side &&
GIT_AUTHOR_DATE="2006-06-26 00:05:00 +0000" &&
GIT_COMMITTER_DATE="2006-06-26 00:05:00 +0000" &&
--
2.32.0.40.gb9b36f9b52
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-07-22 0:04 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-22 0:04 [PATCH] test: diff: use merge instead of pull Felipe Contreras
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).