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

Re: [PATCH v2 0/2] support -m"<msg>" combined with commit --fixup

From
Eric Sunshine <sunshine@sunshineco.com>
Date
Dec 22, 2017, 19:53 UTC
Message-ID
<CAPig+cQj8=YFRBQZ3+9NJAsr2rNq0GvxrUpmt18ttvmVu1Nyhg@mail.gmail.com>
In-Reply-To
<20171222160056.10102-1-avarab@gmail.com>

On Fri, Dec 22, 2017 at 11:00 AM, Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote:

Show 6 quoted lines
> Here's a hopefully ready to apply v2 incorporating feedback from Eric
> (thanks!). A tbdiff with v1 follows below.
>
> Ævar Arnfjörð Bjarmason (2):
>   commit doc: document that -c, -C, -F and --fixup with -m error
>   commit: add support for --fixup <commit> -m"<extra message>"
Patch 2/2 doesn't seem to have made it to the list...
Show 19 quoted lines
> 2: bd78a211ed ! 2: 780de6e042 commit: add support for --fixup <commit> -m"<extra message>"
>     @@ -22,6 +22,21 @@
>             In such a case you might want to leave a small message,
>             e.g. "forgot this part, which broke XYZ".
>
>     +    With this, --fixup <commit> -m"More" -m"Details" will result in a
>     +    commit message like:
>     +
>     +        !fixup <subject of <commit>>
>     +
>     +        More
>     +
>     +        Details
>     +
>     +    The reason the test being added here seems to squash "More" at the end
>     +    of the subject line of the commit being fixed up is because the test
>     +    code is using "%s%b" so the body immediately follows the subject, it's
>     +    not a bug in this code, and other tests t7500-commit.sh do the same
>     +    thing.

Did you also intend to mention something about --edit still working with -m? (Or do we assume that people will understand automatically that it does?)

Previous: Ævar Arnfjörð BjarmasonNext: Ævar Arnfjörð Bjarmason
Message 8 of 16 in “commit doc: document that -c, -C, -F and --fixup with -m error”
  1. 1/2 commit doc: document that -c, -C, -F and --fixup with -m errorÆvar Arnfjörð Bjarmason, Dec 20, 2017
  2. 2/2 commit: add support for --fixup <commit> -m"<extra message>"Ævar Arnfjörð Bjarmason, Dec 20, 2017
  3. Eric SunshineDec 20, 2017
  4. Ævar Arnfjörð BjarmasonDec 20, 2017
  5. Eric SunshineDec 20, 2017
  6. 0/2 support -m"<msg>" combined with commit --fixupÆvar Arnfjörð Bjarmason, Dec 22, 2017
  7. 1/2 commit doc: document that -c, -C, -F and --fixup with -m errorÆvar Arnfjörð Bjarmason, Dec 22, 2017
  8. Eric SunshineDec 22, 2017
  9. Ævar Arnfjörð BjarmasonDec 22, 2017
  10. 2/2 commit: add support for --fixup <commit> -m"<extra message>"Ævar Arnfjörð Bjarmason, Dec 22, 2017
  11. Junio C HamanoDec 22, 2017
  12. Junio C HamanoDec 22, 2017
  13. Ævar Arnfjörð BjarmasonDec 22, 2017
  14. Junio C HamanoDec 22, 2017
  15. Ævar Arnfjörð BjarmasonDec 23, 2017
  16. Eric SunshineDec 20, 2017

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.