Junio C Hamano <junkio@xxxxxxx> wrote: [...] > However, --stage=all with --suffix would introduce name clashes > between repeated conflicted merge runs, which requires Porcelain > to be extra careful. Your last merge run might have involved > three conflicting stages (leaving a.c~1, a.c~2, and a.c~3 in > your working tree) and this time it may be "we removed it while > they modified it" situation (needing to extract a.c~1, a.c~3 but > not a.c~2). The Porcelain needs to make sure not to get > confused by leftover a.c~2 file in the working tree from the > previous run. Clearly. pg was trying to delete all of those files before doing its merge work but failed because of the --ignored bug in git-ls-files; but this is now fixed. Still a possibility for confusion does exist. But in at least one case my Porcelain is Eclipse and a Cygwin prompt. In this case I want to view and edit everything in Eclipse. Having all of the files in the same directory just makes it easier to view. Random temporary names in the same directory as the tracked file would be OK except if I had multiple conflicts in the same directory, in which case I need some easy way to tell them apart. At which point we're starting to derive off the tracked file name and might as well always use well-known names. > If what you are trying is to reduce the number of checkout-index > calls by your Porcelain to extract conflicted stages, it _might_ > make more sense to do something like this instead (I am thinking > aloud, so take this with a big grain of salt -- it may not make > sense at all): > > checkout-index --stage=all checks out higher-order stages in > made-up temporary filenames, just like git-merge-one-file > does using git-unpack-file one-by-one, with a single > invocation. > > It reports the following to its standard output, one record > per pathname in the index: > > tmp1 <SP> tmp2 <SP> tmp3 <TAB> pathname <RS> [...] That's not a bad idea. The only thing I don't like about that is that git-checkout-index won't build the directory tree for me; the Porcelain must still be responsible for doing that before it can rename the temporary files (if available) into the correct subdirectory. My plan with git-checkout-index though was originally to just have it fail if the file already exists, unless -f is given. So if a left-over foo.c#2 was still on disk and git-checkout-index was going to write to that name it would fail. I see a lot of benefit from the checkout to temporary file names and let the Porcelian rename (if it desires). So I'm going to ask you to withdraw the --suffix patch from pu. I'll write up a new patch using the ideas you suggest above and submit that instead. -- Shawn. - : 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