2008/7/18 Karl Hasselström <kha@xxxxxxxxxxx>: > 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. > 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
