git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Shawn O. Pearce" <spearce@spearce.org>
To: Jeff King <peff@peff.net>
Cc: Ari Entlich <lmage11@twcny.rr.com>,
	Michael Witten <mfwitten@MIT.EDU>,
	git@vger.kernel.org
Subject: Re: Proposed git mv behavioral change
Date: Sat, 20 Oct 2007 02:36:28 -0400	[thread overview]
Message-ID: <20071020063628.GV14735@spearce.org> (raw)
In-Reply-To: <20071020062400.GA30388@coredump.intra.peff.net>

Jeff King <peff@peff.net> wrote:
> No, I meant more that the state you have staged will never have actually
> existed in your working tree, so you could not possibly have tested it.
> However, it may be that the changes you are trying to avoid staging are
> trivial, and you're willing to accept that. And git shouldn't stand in
> your way.
> 
> And it sounds like you don't necessarily want to make a _commit_ out of
> this, you just want to keep working and not have git-mv munge your
> staged state.

Yea, I want the same thing.  :-)

And not because I commit things that weren't tested.  Its because
I do mini code reviews for small hunks at a time.  I stage things
I have looked at, and keep things I'm still unsure about unstaged.
But before I commit I make sure my `git diff` output is empty,
so I know that any tests I do now will match what I have when I
run git-commit.

So lets say I make a change in my Makefile that changes the name
of a source file to be more descriptive of that file's contents.
I've reviewed the Makefile change *and* done the file rename,
but I'm still not done reviewing the stuff in the file.  (Yea,
maybe that should be two different commits, but maybe not, lets
not get into that as it depends very much on context.)

Today I move the file, then unstage the hunks I'm not sure about,
then go back and restage them.  Annoying.  It really disrupts
my workflow.

The killer feature in Git for me is the index.  That sucker saves
me on a daily basis as it lets me organize "this i'm happy with,
this i'm not" while I'm in the middle of making a single new commit.
Today git-mv robs me of it.
 
-- 
Shawn.

  parent reply	other threads:[~2007-10-20  6:36 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-10-18 15:47 Proposed git mv behavioral change lmage11
2007-10-19  1:47 ` Michael Witten
2007-10-19  1:57   ` Shawn O. Pearce
2007-10-19  2:07     ` Michael Witten
2007-10-19  2:15       ` Shawn O. Pearce
2007-10-19  2:16       ` Jeff King
2007-10-19  2:29         ` Michael Witten
2007-10-19 11:33           ` Wincent Colaiuta
2007-10-19 15:57             ` Michael Witten
2007-10-19  1:54 ` Shawn O. Pearce
2007-10-19  2:54   ` Michael Witten
2007-10-19  3:19     ` Shawn O. Pearce
2007-10-19  3:24       ` Jeff King
2007-10-19  3:26         ` Michael Witten
2007-10-19  3:35           ` Jeff King
2007-10-19  3:40             ` Michael Witten
2007-10-19  3:47               ` Jeff King
2007-10-19  3:53                 ` Michael Witten
2007-10-19  3:58                   ` Jeff King
2007-10-20  5:55                 ` Ari Entlich
2007-10-20  6:24                   ` Jeff King
2007-10-20  6:34                     ` Michael Witten
2007-10-20  6:36                       ` Jeff King
2007-10-20  6:36                     ` Shawn O. Pearce [this message]
2007-10-20  6:40                       ` Jeff King
2007-10-22 14:00                         ` Karl Hasselström
2007-10-20  6:45                       ` Michael Witten
2007-10-20  7:02                         ` Shawn O. Pearce
2007-10-20 11:15                         ` Wincent Colaiuta
2007-10-22 14:08                           ` Karl Hasselström
2007-10-20  5:55   ` Ari Entlich
2007-10-20  6:30     ` Shawn O. Pearce
2007-10-20  7:46       ` Mike Hommey
2007-10-20  6:34     ` Jeff King
  -- strict thread matches above, loose matches on Subject: below --
2007-10-19  4:41 lmage11
2007-10-20  5:55 Ari Entlich
2007-10-20  6:31 ` Jeff King
2007-10-20 11:02 ` Wincent Colaiuta
2007-10-20 11:06   ` Jeff King

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=20071020063628.GV14735@spearce.org \
    --to=spearce@spearce.org \
    --cc=git@vger.kernel.org \
    --cc=lmage11@twcny.rr.com \
    --cc=mfwitten@MIT.EDU \
    --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).