From: Jeff King <peff@peff.net>
To: Ed Avis <eda@waniasset.com>
Cc: git@vger.kernel.org
Subject: Re: Suggestion: make git checkout safer
Date: Wed, 3 Jun 2015 05:06:55 -0400 [thread overview]
Message-ID: <20150603090654.GD32000@peff.net> (raw)
In-Reply-To: <loom.20150603T104534-909@post.gmane.org>
On Wed, Jun 03, 2015 at 08:50:44AM +0000, Ed Avis wrote:
> Currently a plain 'git checkout .' will revert any local changes, e.g.
>
> % mkdir test
> % cd test
> % git init
> Initialized empty Git repository in /home/eda/test/.git/
> % echo hello >foo
> % git add foo
> % git commit -m.
> [master (root-commit) 34f6694] .
> 1 file changed, 1 insertion(+)
> create mode 100644 foo
> % echo goodbye >foo
> % git checkout .
> % cat foo
> hello
>
> I suggest this is dangerous and by default 'git checkout' should only alter
> files which do not have local changes (as would be reported by 'git diff').
> Only if --force is given should working tree differences be thrown away.
>
> % git --version
> git version 2.4.0
That's what "git checkout <path>" is designed for. I'm not clear on what
you expect "git checkout ." to do in this example, if not overwrite
"foo". Can you elaborate?
-Peff
next prev parent reply other threads:[~2015-06-03 9:07 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-03 8:50 Suggestion: make git checkout safer Ed Avis
2015-06-03 9:06 ` Jeff King [this message]
2015-06-03 9:21 ` Ed Avis
2015-06-03 9:35 ` Jeff King
2015-06-03 9:55 ` Ed Avis
2015-06-03 17:35 ` Junio C Hamano
2015-06-03 17:49 ` Randall S. Becker
2015-06-03 18:11 ` Junio C Hamano
2015-06-03 18:18 ` Randall S. Becker
2015-06-03 18:14 ` Stefan Beller
2015-06-04 10:47 ` Ed Avis
2015-06-04 11:02 ` Ed Avis
2015-06-03 19:26 ` Torsten Bögershausen
2015-06-03 19:47 ` Kevin Daudt
2015-06-04 11:00 ` Ed Avis
2015-06-04 20:14 ` Torsten Bögershausen
2015-06-05 9:32 ` Ed Avis
2015-06-05 10:49 ` Duy Nguyen
2015-06-05 17:44 ` Eric Sunshine
2015-06-05 18:03 ` Junio C Hamano
2015-06-05 18:46 ` Ed Avis
2015-06-05 18:37 ` Eric Sunshine
2015-06-03 20:12 ` Philip Oakley
2015-06-03 17:32 ` Junio C Hamano
2015-06-03 19:06 ` Jeff King
2015-06-03 19:24 ` Randall S. Becker
2015-06-03 21:29 ` Junio C Hamano
2015-06-04 9:01 ` John Szakmeister
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=20150603090654.GD32000@peff.net \
--to=peff@peff.net \
--cc=eda@waniasset.com \
--cc=git@vger.kernel.org \
/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).