git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>,
	git@vger.kernel.org,
	Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: [PATCH 1/1] pull --rebase=<type>: allow single-letter abbreviations for the type
Date: Wed, 08 Aug 2018 15:19:04 -0700	[thread overview]
Message-ID: <xmqqk1p0ec2v.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <xmqqmutwfxh0.fsf@gitster-ct.c.googlers.com> (Junio C. Hamano's message of "Wed, 08 Aug 2018 12:51:39 -0700")

Junio C Hamano <gitster@pobox.com> writes:

> Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
>
>>> -	else if (!strcmp(value, "preserve"))
>>> +	else if (!strcmp(value, "preserve") || !strcmp(value, "p"))
>>>  		return REBASE_PRESERVE;
>>> -	else if (!strcmp(value, "merges"))
>>> +	else if (!strcmp(value, "merges") || !strcmp(value, "m"))
>>>  		return REBASE_MERGES;
>>> -	else if (!strcmp(value, "interactive"))
>>> +	else if (!strcmp(value, "interactive") || !strcmp(value, "i"))
>>>  		return REBASE_INTERACTIVE;
>>
>> Here 3 special cases are added...
>> ...
>>> +test_expect_success 'pull --rebase=i' '
>>> ...
>>> +'
>>> +
>>>  test_expect_success 'pull.rebase=invalid fails' '
>>>  	git reset --hard before-preserve-rebase &&
>>>  	test_config pull.rebase invalid &&
>>
>> ...but this test is only for 1/3. I haven't run this, but it looks like
>> the tests will still pass if we remove --rebase=p and --rebase=m.
>
> Good eyes.  It's not like that parsing these three is implemented
> with one thing; in other words, it is not hard to break one without
> breaking the other two.

Having said that, that can be done as a follow-up "oops, the
original was sloppy" patch.  It's not as bad compared to "oops, the
original was totally borked and here is a fix", so I am OK with that
;-)

      reply	other threads:[~2018-08-08 22:19 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-04 19:23 [PATCH 0/1] Support git pull --rebase=i <remote> <branch> Johannes Schindelin via GitGitGadget
2018-08-04 19:23 ` [PATCH 1/1] pull --rebase=<type>: allow single-letter abbreviations for the type Johannes Schindelin via GitGitGadget
2018-08-06 19:59   ` Junio C Hamano
2018-08-07 12:02     ` Johannes Schindelin
2018-08-07 19:28   ` Ævar Arnfjörð Bjarmason
2018-08-08 19:51     ` Junio C Hamano
2018-08-08 22:19       ` Junio C Hamano [this message]

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=xmqqk1p0ec2v.fsf@gitster-ct.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    --cc=johannes.schindelin@gmx.de \
    /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).