From: Junio C Hamano <gitster@pobox•com>
To: John Keeping <john@keeping•me.uk>
Cc: "Brian Gesiak" <modocache@gmail•com>,
git@vger•kernel.org, "Torsten Bögershausen" <tboegi@web•de>,
"Tim Chase" <git@tim•thechases.com>
Subject: Re: [PATCH v2] git-rebase: Teach rebase "-" shorthand.
Date: Wed, 19 Mar 2014 12:41:31 -0700 [thread overview]
Message-ID: <xmqqk3bq2cyc.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20140319191217.GC11018@serenity.lan> (John Keeping's message of "Wed, 19 Mar 2014 19:12:17 +0000")
John Keeping <john@keeping•me.uk> writes:
> On Wed, Mar 19, 2014 at 12:02:01PM -0700, Junio C Hamano wrote:
>> John Keeping <john@keeping•me.uk> writes:
>>
>> > On Wed, Mar 19, 2014 at 10:53:01AM -0700, Junio C Hamano wrote:
>> >> "rebase -" with your change still says something like this:
>> >>
>> >> First, rewinding head to replay your work on top of it...
>> >> Fast-forwarded HEAD to @{-1}.
>> >>
>> >> instead of "Fast-forwarded HEAD to -". Somebody may later want
>> >> to "fix" this, making these two eye-candy output to be different
>> >> from each other, and what your test expects will no longer hold
>> >> (not that I think it is better to say "-" instead of @{-1}
>> >> there).
>> >
>> > I don't think either of these is correct. When using "-" with the
>> > commands that already support it, I have occasionally found that "-"
>> > isn't what I thought it was.
>> >
>> > Can we use `git name-rev` to put the actual name here, so that people
>> > who have not done what they intended can hopefully notice sooner?
>>
>> That sounds like a right thing to do. It however is totally
>> orthogonal to the change we are discussing, and should be done as a
>> separate patch.
>
> Is it not part of adding support for "-"?
I thought your suggestion was:
'rebase @{-1}' says 'Fast-fowarded HEAD to @{-1}'. It should say
'Fast-forwarded HEAD to 4f407407 (rebase: allow "-" short-hand
for the previous branch, 2014-03-19)' instead.
Or it could be:
'rebase @{-1}' says 'Fast-fowarded HEAD to @{-1}'. It should say
'Fast-forwarded HEAD to master' instead.
In either case, it does not look like such a change is about
teaching "-" as a synonym to "@{-1}".
next prev parent reply other threads:[~2014-03-19 19:41 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-18 8:44 [PATCH] git-rebase: Teach rebase "-" shorthand Brian Gesiak
2014-03-18 19:26 ` Torsten Bögershausen
2014-03-18 19:42 ` Junio C Hamano
2014-03-19 11:02 ` [PATCH v2] " Brian Gesiak
2014-03-19 17:53 ` Junio C Hamano
2014-03-19 18:02 ` John Keeping
2014-03-19 18:09 ` Brian Gesiak
2014-03-19 19:02 ` Junio C Hamano
2014-03-19 19:12 ` John Keeping
2014-03-19 19:41 ` Junio C Hamano [this message]
2014-03-19 19:55 ` John Keeping
2014-03-19 21:02 ` 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=xmqqk3bq2cyc.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@tim$(echo .)thechases.com \
--cc=git@vger$(echo .)kernel.org \
--cc=john@keeping$(echo .)me.uk \
--cc=modocache@gmail$(echo .)com \
--cc=tboegi@web$(echo .)de \
/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