"Catalin Marinas" <catalin.marinas@xxxxxxxxx> writes: > On 18/12/2007, Karl Hasselström <kha@xxxxxxxxxxx> wrote: >> git://repo.or.cz/stgit/kha.git safe > [...] >> Ask git about unmerged files > > This patch wrongly assumes that there is a stage 2 entry in the index. > Test t1202-push-undo.sh fails because a file is added, differently, in > both master and patch but it doesn't exist in ancestor (no stage 2). > Using stage 3 doesn't fix it either because a patch might remove a > file. > > I fixed it by using a set to get the unique names. That sounds reasonable. -- David Kågedal - 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
