git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [TOY PATCH]: rebase: Add --show-files option

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 3, 2014, 19:11 UTC
Message-ID
<xmqqiok1klyh.fsf@gitster.dls.corp.google.com>
In-Reply-To
<CAEY4ZpN4HEo-Csf1UjpGX4YLKWRrywinUemeZFZdVg=ZtTsaqA@mail.gmail.com>
Nazri Ramliy <ayiehere@gmail.com> writes:
Show 17 quoted lines
> When rebasing these upwards of 40+ commits, it is helpful if the
> rebase instruction sheet shows me the actual files that the commits
> affect so I made this patch (sorry I couldn't attach it inline since
> gmail eats all the tabs) that adds the "--show-files" option to
> git-rebase to achieve something to this effect:
>
> pick 996fa59 Remove autoconf submodule
>      # :100644 100644 cfc8a25... 28ddb02... M   .gitmodules
>      # :160000 000000 0263a9f... 0000000... D   autoconf
> ... more pick lines
> pick 4c5070f Remove automake submodule
>      # :100644 100644 28ddb02... f907328... M   .gitmodules
>      # :160000 000000 9042530... 0000000... D   automake
>
> Having the list of files shown below each commit, indented to reduce
> cluttering the "pick" instruction, really does help in deciding the
> reorder and squash candidates.

Sounds like a good idea to give helpful information in a comment form to the insn sheet.

Other than two minor points:
 - If I were doing this, I would have used "diff-tree --stat
   --summary" instead of "show --raw".  You can tell
   deletion/addition by paying attention to 0's and also mode
   changes, but the information density of --raw for human
   consumption is rather low.
 - Regardless of the above, I am not sure if dumping listing of 100+
   paths modified would really help, and it might make sense to cap
   the number of paths displayed for each change.
I didn't look at your implementation at all, though.
Previous: Chris Packham
Message 3 of 3 in “: rebase: Add --show-files option”
  1. : rebase: Add --show-files optionNazri Ramliy, Oct 3, 2014
  2. Chris PackhamOct 3, 2014
  3. Junio C HamanoOct 3, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.