{"thread":{"id":"56139","subject":"[PATCH] test: diff: use merge instead of pull","startedAt":"2021-07-22T00:04:57Z","lastAt":"2021-07-22T00:04:57Z","messageCount":1,"participants":["Felipe Contreras"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"430850","messageId":"20210722000441.1898891-1-felipe.contreras@gmail.com","threadId":"56139","inReplyTo":null,"subject":"[PATCH] test: diff: use merge instead of pull","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2021-07-22T00:04:41Z","receivedAt":"2021-07-22T00:04:57Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"No need to call `git pull --merge .` when `git merge` suffices.\n\nSigned-off-by: Felipe Contreras <felipe.contreras@gmail.com>\n---\n t/t4013-diff-various.sh | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh\nindex 7fadc985cc..447cf269da 100755\n--- a/t/t4013-diff-various.sh\n+++ b/t/t4013-diff-various.sh\n@@ -65,7 +65,7 @@ test_expect_success setup '\n \texport GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&\n \n \tgit checkout master &&\n-\tgit pull -s ours . side &&\n+\tgit merge -s ours side &&\n \n \tGIT_AUTHOR_DATE=\"2006-06-26 00:05:00 +0000\" &&\n \tGIT_COMMITTER_DATE=\"2006-06-26 00:05:00 +0000\" &&\n-- \n2.32.0.40.gb9b36f9b52\n\n"}]}