From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Tay Ray Chuan <rctay89@gmail.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH 3/3] builtin/checkout: DWIM with -f -b
Date: Sun, 20 Jun 2010 16:11:38 -0400 [thread overview]
Message-ID: <20100620201137.GA8502@coredump.intra.peff.net> (raw)
In-Reply-To: <7vvd9dtt54.fsf@alter.siamese.dyndns.org>
On Sun, Jun 20, 2010 at 12:12:55PM -0700, Junio C Hamano wrote:
> I think this is not "DWIM" but is "-f does not work with -b; fix it".
>
> Will queue; thanks.
I am not sure it is fixing a bug. There are really two possible things
to be forced during checkout:
1. throw away local changes
2. overwrite an existing branch
Right now, "checkout -f" means just (1). This patch makes it _also_ mean
(2). Do we want to conflate those two cases?
In some sense, it is reasonable for "-f" to mean "force anything that
might be questionable". But I wonder if it pays to be a little more
conservative given that this is a safety valve we are talking about. The
user can of course still split their compound action into:
git branch [-f] new_branch old_branch
git checkout [-f] new_branch
Less convenient, but there is no ambiguity.
I dunno. I don't have a strong feeling on how it should be, but I think
it is more than a simple bug fix.
-Peff
next prev parent reply other threads:[~2010-06-20 20:11 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-20 16:33 [PATCH 0/3] DWIM with "git checkout -f -b" Tay Ray Chuan
2010-06-20 16:33 ` [PATCH 1/3] add tests for checkout -b Tay Ray Chuan
2010-06-20 16:33 ` [PATCH 2/3] t2018-checkout-branch.sh: show that checkout -f -b doesn't DWIM Tay Ray Chuan
2010-06-20 16:33 ` [PATCH 3/3] builtin/checkout: DWIM with -f -b Tay Ray Chuan
2010-06-20 19:12 ` Junio C Hamano
2010-06-20 20:11 ` Jeff King [this message]
2010-06-20 21:07 ` Clemens Buchacher
2010-06-20 21:10 ` Junio C Hamano
2010-06-20 21:16 ` Jeff King
2010-06-21 0:09 ` Junio C Hamano
2010-06-21 1:08 ` Tay Ray Chuan
2010-06-21 5:15 ` Junio C Hamano
2010-06-21 17:19 ` [PATCH 0/3] teach git-checkout -B WAS " Tay Ray Chuan
2010-06-21 17:19 ` [PATCH 1/3] add tests for checkout -b Tay Ray Chuan
2010-06-21 17:19 ` [PATCH 2/3] builtin/checkout: change -b from an OPTION_STRING to a OPTION_SET_INT Tay Ray Chuan
2010-06-21 17:19 ` [PATCH 3/3] builtin/checkout: learn -B Tay Ray Chuan
2010-06-23 18:36 ` Junio C Hamano
2010-06-23 19:13 ` Tay Ray Chuan
2010-06-21 23:04 ` [PATCH 2/3] builtin/checkout: change -b from an OPTION_STRING to a OPTION_SET_INT Erick Mattos
2010-06-23 19:04 ` Tay Ray Chuan
2010-06-23 21:37 ` Erick Mattos
2010-06-21 17:24 ` [PATCH 0/3] teach git-checkout -B WAS builtin/checkout: DWIM with -f -b Tay Ray Chuan
2010-06-21 21:30 ` Erick Mattos
2010-06-23 19:28 ` [PATCH v2 " Tay Ray Chuan
2010-06-23 19:28 ` [PATCH v2 1/3] add tests for checkout -b Tay Ray Chuan
2010-06-23 19:28 ` [PATCH v2 2/3] builtin/checkout: reword hint for -b Tay Ray Chuan
2010-06-23 19:29 ` [PATCH v2 3/3] builtin/checkout: learn -B Tay Ray Chuan
2010-06-21 2:58 ` [PATCH 3/3] builtin/checkout: DWIM with -f -b Michel Lespinasse
2010-06-21 4:09 ` Michel Lespinasse
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=20100620201137.GA8502@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=rctay89@gmail.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).