Re: [PATCH] update-index: add --swap to swap index and worktree content

From: Jeff King <peff@peff.net>
Date: Aug 17, 2011, 02:17 UTC
Message-ID: <20110817021727.GA29585@sigill.intra.peff.net>
In-Reply-To: <CACsJy8Ad4xPz79jT3O64c3XsCeM8XETJ9bnjK0aisagrYN0CMA@mail.gmail.com>

On Wed, Aug 17, 2011 at 09:11:32AM +0700, Nguyen Thai Ngoc Duy wrote:

> I blame git for training me always do "git diff" before update index.
> But if we add "add -e", I could also make "add -e -p" work, (edit
> temporary file first, then fall back to interactive mode and let me
> review my changes).

Yeah, that would be cool. But note that "git add -e" already exists for patch editing.

> Two reasons. I already mentioned the ability to quickly checkout index
> for a quick test (though there could be more problems down that road).

That's a good thought. However, in practice, I find I also need other files from the index to do a successful test. So I end up just committing what I think is right, and then afterwards do:

  GIT_EDITOR='sed -i "/^pick .*/aexec make test/"' git rebase -i

to test and fixup each commit individually.

You could probably use "checkout-index" to create a pristine workspace to test. It's a little inefficient to write out all of the files again, but probably the actual build and test procedure would be much more expensive, anyway.

-Peff