git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: Aaron Greenberg <p@aaronjgreenberg.com>
Cc: git@matthieu-moy.fr, git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH v2] branch: implement shortcut to delete last branch
Date: Mon, 26 Mar 2018 04:10:36 -0400	[thread overview]
Message-ID: <20180326081036.GA18714@sigill.intra.peff.net> (raw)
In-Reply-To: <1521844835-23956-1-git-send-email-p@aaronjgreenberg.com>

On Fri, Mar 23, 2018 at 10:40:34PM +0000, Aaron Greenberg wrote:

> I updated the commit message to include my first email's cover letter
> and cleaned up the test.

Thanks. This one looks good to me.

> I can appreciate Matthieu's points on the use of "-" in destructive
> commands. As of this writing, git-merge supports the "-" shorthand,
> which while not destructive, is at least _mutative_. Also,
> "git branch -d" is not destructive in the same way that "rm -rf" is
> destructive since you can recover the branch using the reflog.

There's a slight subtlety there with the reflog, because "branch -d"
actually _does_ delete the reflog for the branch. By definition if
you've found the branch with "-" then it was just checked out, so you at
least have the old tip. But the branch's whole reflog is gone for good.

That said, I'd still be OK with it.

> One thing to consider is that approval of this patch extends the
> implementation of the "-" shorthand in a piecemeal, rather than
> consistent, way (implementing it in a consistent way was the goal of
> the patch set you mentioned in your previous email.) Is that okay? Or
> is it better to pick up the consistent approach where it was left?

I don't have a real opinion on whether it should be implemented
everywhere or not. But IMHO it's OK to do it piecemeal for now either
way, unless we're really sure it's time to move to respecting it
everywhere. Because we can always convert a
piecemeal-but-covers-everything state to centralized parsing as a
cleanup.

-Peff

  parent reply	other threads:[~2018-03-26  8:10 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-23  2:09 [PATCH] branch: implement shortcut to delete last branch Aaron Greenberg
2018-03-23  2:09 ` Aaron Greenberg
2018-03-23  8:56 ` Jeff King
2018-03-23  9:00   ` Jeff King
2018-03-23 22:40   ` [PATCH v2] " Aaron Greenberg
2018-03-23 22:40     ` [PATCH] " Aaron Greenberg
2018-03-26  8:10     ` Jeff King [this message]
2018-03-26 12:41       ` [PATCH v2] " git
2018-03-26 16:49         ` 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=20180326081036.GA18714@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=git@matthieu-moy.fr \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=p@aaronjgreenberg.com \
    /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).