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

Re: [PATCH v2 1/2] doc: merge-tree: provide a commit message

From
KHKristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com>
Date
Oct 9, 2024, 16:35 UTC
Message-ID
<e339f796-bb9c-439f-a24c-0c5e79257379@app.fastmail.com>
In-Reply-To
<xmqqo73uz5qg.fsf@gitster.g>
On Tue, Oct 8, 2024, at 22:42, Junio C Hamano wrote:
Show 22 quoted lines
> Kristoffer Haugsbakk <code@khaugsbakk.name> writes:
>
>> Provide a commit message in the example command.
>>
>> The command will hang since it is waiting for a commit message on
>> stdin.  Which is usable but not straightforward enough since this is
>> example code.
>>
>> Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
>> ---
>
> Makes sense.
>
>> -       NEWCOMMIT=$(git commit-tree $NEWTREE -p $BRANCH1 -p $BRANCH2)
>> +       NEWCOMMIT=$(git commit-tree $NEWTREE -F $FILE_WITH_COMMIT_MESSAGE \
>> +           -p $BRANCH1 -p $BRANCH2)
>>         git update-ref $BRANCH1 $NEWCOMMIT
>
> The shell should know, after seeing $FILE_WITH_COMMIT_MESSAGE and
> encountering the end of line, that you haven't completed telling
> what you started telling it.  Do you need " \" at the end of the
> line?
I tried that and got an error: `-p: not found`.
Show 12 quoted lines
> I know that it was suggested to use a file with message, and I agree
> with the suggestion, but then I wonder if we want to be more
> complete and show that a file gets prepared in the example to avoid
> making readers wonder where $FILE_WITH_COMMIT_MESSAGE comes from?
>
> E.g.,
>
>         vi message.txt
>         NEWCOMMIT=$(git comimt-tree $NEWTREE -F message.txt
>                     -p $BRANCH1 -p $BRANCH2)
>
> or something like that?
I’ll do that.

-- Kristoffer but any Christopher-variation is fine

Previous: Kristoffer HaugsbakkNext: Junio C Hamano
Message 18 of 27 in “doc: merge-tree: improve the script example”
  1. 0/3 doc: merge-tree: improve the script exampleKristoffer Haugsbakk, Oct 7, 2024
  2. 1/3 doc: merge-tree: provide a commit messageKristoffer Haugsbakk, Oct 7, 2024
  3. Kristoffer HaugsbakkOct 7, 2024
  4. Elijah NewrenOct 7, 2024
  5. Kristoffer HaugsbakkOct 7, 2024
  6. 2/3 doc: merge-tree: use lower-case variablesKristoffer Haugsbakk, Oct 7, 2024
  7. Phillip WoodOct 7, 2024
  8. Elijah NewrenOct 7, 2024
  9. 3/3 doc: merge-tree: use || directlyKristoffer Haugsbakk, Oct 7, 2024
  10. Elijah NewrenOct 7, 2024
  11. Kristoffer HaugsbakkOct 7, 2024
  12. Phillip WoodOct 7, 2024
  13. Kristoffer HaugsbakkOct 7, 2024
  14. 0/2 doc: merge-tree: improve the script exampleKristoffer Haugsbakk, Oct 8, 2024
  15. 1/2 doc: merge-tree: provide a commit messageKristoffer Haugsbakk, Oct 8, 2024
  16. Junio C HamanoOct 8, 2024
  17. Kristoffer HaugsbakkOct 8, 2024
  18. Kristoffer HaugsbakkOct 9, 2024
  19. Junio C HamanoOct 9, 2024
  20. Andreas SchwabOct 9, 2024
  21. 2/2 doc: merge-tree: use || directlyKristoffer Haugsbakk, Oct 8, 2024
  22. Junio C HamanoOct 8, 2024
  23. Kristoffer HaugsbakkOct 8, 2024
  24. 0/1 doc: merge-tree: improve the script exampleKristoffer Haugsbakk, Oct 9, 2024
  25. 1/1 doc: merge-tree: improve example scriptKristoffer Haugsbakk, Oct 9, 2024
  26. Elijah NewrenOct 9, 2024
  27. Junio C HamanoOct 10, 2024

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.