Re: [StGit PATCH] Test that we can add a new file to a non-topmost patch with refresh -p

From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Jul 21, 2008, 22:01 UTC
Message-ID: <b0943d9e0807211501g68d1cffeh12bcb34df0f28dae@mail.gmail.com>
In-Reply-To: <20080718180109.GA14825@diana.vm.bytemark.co.uk>

2008/7/18 Karl Hasselström <kha@treskal.com>:

Show 10 quoted lines

> On 2008-07-18 19:03:06 +0200, Karl Hasselström wrote:
>
>> We currently can't -- this is bug 12038, found by Jon Smirl. See
>>
>>   https://gna.org/bugs/index.php?12038
>
> OK, the problem is that to pop the patches on top of the one we are to
> refresh, we call pop_patch(keep = True). This in turn calls
> git.switch(keep = True), which resets the index (but is careful to not
> touch the worktree).

Yes.

Show 7 quoted lines

> I'm not quite sure how to fix this in a simple way -- the code simply
> assumes that the index contains nothing of interest. And since I
> already have a rewrite of refresh that handles this and a handful of
> other cases that the old code does not, I'm kind of disinclined to
> undertake a larger restructuring of the code.
>
> Catalin, what do you think?

I don't think we should spend time on fixing the current code as you already have a new implementation. Maybe we could add a simple test and refuse refreshing other than the topmost patch in case of files added to the index.

-- 
Catalin