On Mon, Feb 4, 2019 at 1:20 PM Junio C Hamano <gitster@xxxxxxxxx> wrote: > > Elijah Newren <newren@xxxxxxxxx> writes: > > There is one place that says combined-all-paths, and everywhere else > it says combined-all-names. The former is probably techincally more > correct, I think ;-) Looks like I had a mixture of my original name (combined-with-paths) and the one someone else suggested (combined-all-names). Since you like the hybrid better, I'll switch them all over to it. > > The combined diff format for merges will only list one filename, even if > > rename or copy detection is active. For example, with raw format one > > might see: > > > > ::100644 100644 100644 fabadb8 cc95eb0 4866510 MM describe.c > > ::100755 100755 100755 52b7a2d 6d1ac04 d2ac7d7 RM bar.sh > > ::100644 100644 100644 e07d6c5 9042e82 ee91881 RR phooey.c > > > > This doesn't let us know what the original name of bar.sh was in the > > first parent, and doesn't let us know what either of the original names > > of phooey.c were in either of the parents. In contrast, for non-merge > > commits, raw format does provide original filenames (and a rename score > > to boot). In order to also provide original filenames for merge > > commits, add a --combined-all-names option (which must be used with > > either -c or --cc, and is likely only useful with rename or copy > > detection active) so that we can print tab-separated filenames when > > renames are involved. This transforms the above output to: > > > > ::100644 100644 100644 fabadb8 cc95eb0 4866510 MM desc.c desc.c desc.c > > ::100755 100755 100755 52b7a2d 6d1ac04 d2ac7d7 RM foo.sh bar.sh bar.sh > > ::100644 100644 100644 e07d6c5 9042e82 ee91881 RR fooey.c fuey.c phooey.c > > > > Further, in patch format, this changes the from/to headers so that > > instead of just having one "from" header, we get one for each parent. > > For example, instead of having > > > > --- a/phooey.c > > +++ b/phooey.c > > > > we would see > > > > --- a/fooey.c > > --- a/fuey.c > > +++ b/phooey.c > > Do we have the three "rename from fooey.c", "rename from fuey.c" and > "rename to "phooey.c" extended headers, too? That's what I meant in > my response, but I do like what I see in the above example ;-) Ah, gotcha. I'll look into whether it's possible to hook it up to diff.c's fill_metainfo() . Elijah
