From: John Keeping <john@keeping.me.uk>
To: Junio C Hamano <gitster@pobox.com>
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 19:12:17 +0000 [thread overview]
Message-ID: <20140319191217.GC11018@serenity.lan> (raw)
In-Reply-To: <xmqqsiqe2es6.fsf@gitster.dls.corp.google.com>
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'm not arguing for a change to any existing functionality, just to the
behaviour introduced by this patch, which is basically a change from
"@{-1}" to "$(git name-rev --name-only @{-1})" in the patch. (The error
handling of name-rev appears not to be very useful here when the
previous branch has been deleted, so I don't think it's quite that
simple, but that's the principle.)
next prev parent reply other threads:[~2014-03-19 19:12 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 [this message]
2014-03-19 19:41 ` Junio C Hamano
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=20140319191217.GC11018@serenity.lan \
--to=john@keeping.me.uk \
--cc=git@tim.thechases.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=modocache@gmail.com \
--cc=tboegi@web.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).