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

From: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Date: Aug 18, 2011, 01:01 UTC
Message-ID: <CAOeW2eG5LsNLCpdXvphRqkDZZMTRrHiA1-82ckkfWntKvQ7XFg@mail.gmail.com>
In-Reply-To: <20110817194621.GA352@sigill.intra.peff.net>

On Wed, Aug 17, 2011 at 3:46 PM, Jeff King <peff@peff.net> wrote:

Show 13 quoted lines

> On Wed, Aug 17, 2011 at 10:13:08AM -0400, Martin von Zweigbergk wrote:
>
>> >> 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:
>>
>> Maybe a stupid question, but "update-index --swap" would swap all
>> files, right? So what "other files from the index" would there be?
>
> Hmm. I hadn't really considered swapping everything.

Ah, then I see where the misunderstanding lay. I didn't read the patch; maybe it would have been clear if I did (and understood it).

> I suppose that
> would work, though I do worry about getting into a confused state when
> you have swapped one or more files individually, and then want to swap
> the rest out for testing.

I have a feeling that I would get confused if I started swapping more than one individual file, so to me it feels like it's more the possibility of swapping individual files that could cause confusion, whether or not it is possible to swap all.

I think stashing the work tree feels more right, though. All you really want is to get the work tree version out of the way for a while, you don't really want it in the index.

Martin