git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Paul Tan <pyokagan@gmail.com>
To: git@vger.kernel.org
Cc: Johannes Schindelin <johannes.schindelin@gmx.de>,
	Stefan Beller <sbeller@google.com>, Paul Tan <pyokagan@gmail.com>,
	Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v2 07/12] t4013: call git-merge instead of git-pull
Date: Thu,  7 May 2015 16:44:03 +0800	[thread overview]
Message-ID: <1430988248-18285-8-git-send-email-pyokagan@gmail.com> (raw)
In-Reply-To: <1430988248-18285-1-git-send-email-pyokagan@gmail.com>

Since "git fetch ." does not update any refs, "git pull . side" is
equivalent to calling "git merge side".

As such, replace the call to git-pull with a call to git-merge to reduce
the dependence on git-pull's functionality to reduce irrelevant test
breakage when git-pull is rewritten to C.

Signed-off-by: Paul Tan <pyokagan@gmail.com>
---

Notes:
    * This is a new patch in the patch series.

 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 6ec6072..48f2fe2 100755
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -64,7 +64,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.1.4

  parent reply	other threads:[~2015-05-07  8:44 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-07  8:43 [PATCH v2 00/12] Improve git-pull test coverage Paul Tan
2015-05-07  8:43 ` [PATCH v2 01/12] t5520: implement tests for no merge candidates cases Paul Tan
2015-05-07  9:05   ` Torsten Bögershausen
2015-05-07 14:04     ` Junio C Hamano
2015-05-07 14:47       ` Paul Tan
2015-05-07 15:56         ` Junio C Hamano
2015-05-07 14:56       ` Torsten Bögershausen
2015-05-07  8:43 ` [PATCH v2 02/12] t5520: test for failure if index has unresolved entries Paul Tan
2015-05-07 18:28   ` Eric Sunshine
2015-05-12 13:43     ` Paul Tan
2015-05-07  8:43 ` [PATCH v2 03/12] t5520: test work tree fast-forward when fetch updates head Paul Tan
2015-05-07 16:23   ` Stefan Beller
2015-05-07 17:12   ` Junio C Hamano
2015-05-07 17:32     ` Paul Tan
2015-05-07  8:44 ` [PATCH v2 04/12] t5520: test --rebase with multiple branches Paul Tan
2015-05-07  8:44 ` [PATCH v2 05/12] t5520: test --rebase failure on unborn branch with index Paul Tan
2015-05-07 16:32   ` Stefan Beller
2015-05-07 17:44     ` Paul Tan
2015-05-07 18:20       ` Eric Sunshine
2015-05-07  8:44 ` [PATCH v2 06/12] t5521: test --dry-run does not make any changes Paul Tan
2015-05-07  8:44 ` Paul Tan [this message]
2015-05-07 16:26   ` [PATCH v2 07/12] t4013: call git-merge instead of git-pull Johannes Schindelin
2015-05-07 16:55     ` Paul Tan
2015-05-08 13:12       ` Johannes Schindelin
2015-05-07 17:17     ` Junio C Hamano
2015-05-07  8:44 ` [PATCH v2 08/12] t5520: ensure origin refs are updated Paul Tan
2015-05-07  8:44 ` [PATCH v2 09/12] t7406: use "git pull" instead of "git pull --rebase" Paul Tan
2015-05-07 17:24   ` Junio C Hamano
2015-05-07 18:17     ` Paul Tan
2015-05-07 20:15       ` Junio C Hamano
2015-05-10  8:19         ` Paul Tan
2015-05-07  8:44 ` [PATCH v2 10/12] t5520: failing test for pull --all with no configured upstream Paul Tan
2015-05-07 17:38   ` Junio C Hamano
2015-05-07 18:05     ` Paul Tan
2015-05-07 18:48       ` Junio C Hamano
2015-05-09  3:10         ` Paul Tan
2015-05-07  8:44 ` [PATCH v2 11/12] t5524: test --log=1 limits shortlog length Paul Tan
2015-05-07 16:28   ` Johannes Schindelin
2015-05-07 17:06     ` Paul Tan
2015-05-07 19:12       ` Johannes Sixt
2015-05-08 10:07         ` Johannes Schindelin
2015-05-08 10:59           ` Thomas Gummerer
2015-05-08 13:09             ` Johannes Schindelin
2015-05-08 17:19           ` Johannes Sixt
2015-05-08 17:32             ` Junio C Hamano
2015-05-07 17:28   ` Junio C Hamano
2015-05-07  8:44 ` [PATCH v2 12/12] t5520: check reflog action in fast-forward merge Paul Tan
2015-05-07 16:39   ` Stefan Beller
2015-05-07 19:01 ` [PATCH v2 00/12] Improve git-pull test coverage Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1430988248-18285-8-git-send-email-pyokagan@gmail.com \
    --to=pyokagan@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=johannes.schindelin@gmx.de \
    --cc=sbeller@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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 NNTP newsgroup(s).