From: Tay Ray Chuan <rctay89@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jeff King <peff@peff.net>, Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH 3/3] builtin/checkout: DWIM with -f -b
Date: Mon, 21 Jun 2010 09:08:27 +0800 [thread overview]
Message-ID: <AANLkTik3QZBpOjwZHGwIXphXnaHLaBV4pUSb1OVAau9V@mail.gmail.com> (raw)
In-Reply-To: <7vfx0htfer.fsf@alter.siamese.dyndns.org>
Hi,
On Mon, Jun 21, 2010 at 8:09 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Jeff King <peff@peff.net> writes:
>
>> ... For your workflow, I
>> doubt it matters, but it is potentially destructive.
>
> Yes; I thought the implication of "-f" to be destructive would be a
> justification enough, but I agree with you that conflating the two may be
> a bad idea. When a user says "git checkout -f -b jch" after seeing the
> command without "-f" fail due to existing "jch", it is quite clear that
> the user wants to clobber the history of existing "jch" branch (why else
> would he giving "-f"), but it is not a justification to clobber local
> changes he has in the index and the work tree.
How about doing
git checkout -f -f -b <branch>
?
By having the user to specify "-f" twice, we're can be really sure
that the user wants to
1) throw away local changes, which is what the current "-f" is
supposed to do, and
2) reset an existing branch - new behaviour.
--
Cheers,
Ray Chuan
next prev parent reply other threads:[~2010-06-21 1:08 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
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 [this message]
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=AANLkTik3QZBpOjwZHGwIXphXnaHLaBV4pUSb1OVAau9V@mail.gmail.com \
--to=rctay89@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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).