Re: [PATCH v4] log,diff-tree: add --combined-all-names option
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Feb 4, 2019, 21:20 UTC
- Message-ID
- <xmqqlg2vtfmo.fsf@gitster-ct.c.googlers.com>
- In-Reply-To
- <20190204200754.16413-1-newren@gmail.com>
Elijah Newren <newren@gmail.com> 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 ;-)
Show 34 quoted lines
> 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 ;-)
Show 17 quoted lines
> -. single path, only for "dst" > +. tab-separated pathname(s) of the file > > -Example: > +For `-c` and `--cc`, only the destination or final path is shown even > +if the file was renamed on any side of history. With > +`--combined-all-names`, the name of the path in each parent is shown > +followed by the name of the path in the merge commit. > + > +Examples for `-c` and `-cc` without `--combined-all-names`: > +------------------------------------------------ > +::100644 100644 100644 fabadb8 cc95eb0 4866510 MM desc.c > +::100755 100755 100755 52b7a2d 6d1ac04 d2ac7d7 RM bar.sh > +::100644 100644 100644 e07d6c5 9042e82 ee91881 RR phooey.c > +------------------------------------------------ > + > +Examples when `--combined-all-names` added to either `-c` or `--cc`: