From: Junio C Hamano <gitster@pobox•com>
To: Johannes Schindelin <johannes.schindelin@gmx•de>
Cc: Paul Tan <pyokagan@gmail•com>,
git@vger•kernel.org, Stefan Beller <sbeller@google•com>
Subject: Re: [PATCH v2 07/12] t4013: call git-merge instead of git-pull
Date: Thu, 07 May 2015 10:17:42 -0700 [thread overview]
Message-ID: <xmqqk2wkqpc9.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <a2c6df723ca5237c094ab4002e45a834@www.dscho.org> (Johannes Schindelin's message of "Thu, 07 May 2015 18:26:34 +0200")
Johannes Schindelin <johannes.schindelin@gmx•de> writes:
> Both this patch and 9/12 change `git pull` invocations to equivalent
> non-pull ones, but I wonder whether it would not be a better idea to
> leave them as-are, so that we can make sure that scripts out there
> that might use similar `git pull` invocations would be unaffected by
> the rewrite?
Yes. I do not mind changing t4013 that is not about testing 'git pull'
to lose 'git pull . other-branch', but then we would want to have a
corresponding test somewhere in the test script that is about
testing 'git pull' to cover that (ancient) pattern of use.
Thanks.
next prev parent reply other threads:[~2015-05-07 17:17 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 ` [PATCH v2 07/12] t4013: call git-merge instead of git-pull Paul Tan
2015-05-07 16:26 ` Johannes Schindelin
2015-05-07 16:55 ` Paul Tan
2015-05-08 13:12 ` Johannes Schindelin
2015-05-07 17:17 ` Junio C Hamano [this message]
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=xmqqk2wkqpc9.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=johannes.schindelin@gmx$(echo .)de \
--cc=pyokagan@gmail$(echo .)com \
--cc=sbeller@google$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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