Tim Mazid venit, vidit, dixit 24.03.2010 03:01: > > Hi, > > I'm not sure if this is a bug or if it should be thus. > > Basically, a 'git stash --keep-index' followed immediately by a 'git stash pop' (no changes made) will result in a conflict. > > Steps to reproduce: > > > Put > > "AAA > BBB > CCC" > > into file 'test' > > $ git add test > $ git commit -m "A" > > Append lines > > "DDD > EEE > FFF > GGG" > > into file 'test' > > $ git add -p > > Press 'e' and remove the "FFF" and "GGG" files from the patch, to stage only the "DDD" and "EEE" files. > > $ git stash --keep-index Right here, git stash show -p shows that the recorded stash is a merge diff: diff --cc test index 7b0e998,988cecb..83b9202 --- a/test +++ b/test @@@ -1,3 -1,5 +1,7 @@@ AAA BBB CCC + DDD + EEE ++FFF ++GGG The index still has the following (git diff --staged): diff --git c/test i/test index 7b0e998..988cecb 100644 --- c/test +++ i/test @@ -1,3 +1,5 @@ AAA BBB CCC +DDD +EEE > $ git stash pop > > CONFLICT > > > I hope that's clear enough. git diff shows the conflict: diff --cc test index 988cecb,83b9202..0000000 --- i/test +++ w/test @@@ -3,3 -3,5 +3,8 @@@ BB CCC DDD EEE ++<<<<<<< Updated upstream ++======= + FFF + GGG ++>>>>>>> Stashed changes According to the example in the man page, I would have thought that committing between save and pop would help, but it produces the same problem. pop --index doesn't help either. Do you happen to know whether this used to work? Michael -- 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