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

Re: [PATCH/RFC] range-diff: make output format more useful for "rebase --onto"

From
Junio C Hamano <gitster@pobox.com>
Date
Sep 19, 2021, 21:22 UTC
Message-ID
<xmqqr1dkdzwn.fsf@gitster.g>
In-Reply-To
<87r1dmcooj.fsf@evledraar.gmail.com>
Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
Show 13 quoted lines
> As for the proposed output, I'm a bit negative on it, so first, if we're
> trying to note that two commits are the same wouldn't it be much better
> to just omit the second SHA-1? I.e. consider this variation of your
> proposed output;
>
>      1 = 1 a05f02b1d9 a05102bfd9 : t/helper/test-bitmap.c: add  ...
>
> You might eyeball that for a while before discovering that I switched
> the "f" and "1" around, i.e. the SHA-1s look /almost/ the same. Isn't
> this better? (or we could use "++++++++++" to not overlead any meaning
> "----------" has):
>
>      1 = 1 a05f02b1d9 ---------- : t/helper/test-bitmap.c: add  ...

It will not serve my purpose at all. Assuming that the first one are the equivalent and the later ones are different, the point of changing the format is to allow an easy cut-and-paste after "git rebase --onto" to create:

    $ git rebase --onto a05f02b1d9 a05102bfd9
and it is useless to show dashes, as I do not think this would work:
    $ git rebase --onto a05f02b1d9 ----------
;-)
Previous: Ævar Arnfjörð Bjarmason
Message 6 of 6 in “range-diff: make output format more useful for "rebase --onto"”
  1. range-diff: make output format more useful for "rebase --onto"Junio C Hamano, Sep 17, 2021
  2. Eric SunshineSep 18, 2021
  3. Taylor BlauSep 18, 2021
  4. Ævar Arnfjörð BjarmasonSep 18, 2021
  5. Ævar Arnfjörð BjarmasonSep 19, 2021
  6. Junio C HamanoSep 19, 2021

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.