git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Ed Avis <eda@waniasset.com>, git@vger.kernel.org
Subject: Re: Suggestion: make git checkout safer
Date: Wed, 03 Jun 2015 10:32:40 -0700	[thread overview]
Message-ID: <xmqqlhg0y9xj.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20150603093514.GF32000@peff.net> (Jeff King's message of "Wed, 3 Jun 2015 05:35:15 -0400")

Jeff King <peff@peff.net> writes:

> If we want to introduce more safety here, I'd be inclined to perform the
> operation by default, but give a better escape hatch. For example, by
> creating a loose object for any file we're about to overwrite, and
> possibly writing an entry into a log.

Can we borrow the ideas from other tools that have similar
characteristics, I wonder.

"git checkout $paths" (and you can give "." for $paths to mean
"everything") is akin to "cp -R $elsewhere/$path ." to restore the
working tree copies from somewhere else.

"Ouch, 'git checkout .'  overwrote what was in my working tree" is
exactly the same kind of confusion as "I ran 'cp -r ../saved .' and
it overwrote everything".  As you said in your initial response,
that is what the command is meant for.

What does that similar command outside world, "cp", have for "more
safety"?  'cp -i' asks if the user wants to overwrite a file for
each path; perhaps a behaviour similar to that was the original
poster wanted to see?

  parent reply	other threads:[~2015-06-03 17:32 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
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 [this message]
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=xmqqlhg0y9xj.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox.com \
    --cc=eda@waniasset.com \
    --cc=git@vger.kernel.org \
    --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).