From: Junio C Hamano <gitster@pobox•com>
To: Paul Tan <pyokagan@gmail•com>
Cc: Git List <git@vger•kernel.org>,
Johannes Schindelin <johannes.schindelin@gmx•de>,
Stefan Beller <sbeller@google•com>,
Peter Hutterer <peter.hutterer@who-t•net>
Subject: Re: [PATCH v2 09/12] t7406: use "git pull" instead of "git pull --rebase"
Date: Thu, 07 May 2015 13:15:40 -0700 [thread overview]
Message-ID: <xmqqpp6cnnyr.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <CACRoPnQ3zYsv63pNUtasS6y2HnWMYqwssF=yFA3OHVvF2Yb5Sw@mail.gmail.com> (Paul Tan's message of "Fri, 8 May 2015 02:17:48 +0800")
Paul Tan <pyokagan@gmail•com> writes:
> Hi,
>
> On Fri, May 8, 2015 at 1:24 AM, Junio C Hamano <gitster@pobox•com> wrote:
>> Paul Tan <pyokagan@gmail•com> writes:
>> If 'git pull' gets broken, it will break this test _anyway_.
>
> You have a point, perhaps this should be changed to git-fetch + git-merge?
>
> Well my reasoning is that it's because git-pull --rebase requires more
> code to be implemented than git-pull. So I'm thinking that git-pull
> --rebase is more likely to break than git-pull.
>
>> Unless
>> the operating assumption is "it is OK to break 'git pull --rebase',
>> as long as we do not break 'git pull', while rewriting it", I am not
>> sure the value of the change in this patch. We'd need to keep both
>> form working, no?
>
> Yes, ultimately the git-pull rewrite must re-implement everything, but
> if this test suite is affected by any git-pull (--rebase) breakage,
> then there will be lots of patch noise as this test suite's tests get
> disabled/re-enabled in the git-pull rewrite patches.
>
> But if the patch noise is okay, then I'm fine with dropping this patch
> and 07/12.
I am not sure what you mean by "patch noise".
I do not think touching this test which does not have anything to do
with "git pull" in your series is sensible at all, and you shouldn't
flip test_expect_success temporarily to _expect_failure, if that is
what you have in mind.
Just don't run unrelated tests while your series is in flux.
next prev parent reply other threads:[~2015-05-07 20:15 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
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 [this message]
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=xmqqpp6cnnyr.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=johannes.schindelin@gmx$(echo .)de \
--cc=peter.hutterer@who-t$(echo .)net \
--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