git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andreas Schwab <schwab@linux-m68k.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: Kristoffer Haugsbakk <code@khaugsbakk.name>,
	 git@vger.kernel.org,  Eric Sunshine <sunshine@sunshineco.com>,
	 newren@gmail.com
Subject: Re: [PATCH v2 1/2] doc: merge-tree: provide a commit message
Date: Wed, 09 Oct 2024 18:58:14 +0200	[thread overview]
Message-ID: <878quxfc2h.fsf@igel.home> (raw)
In-Reply-To: <xmqqo73uz5qg.fsf@gitster.g> (Junio C. Hamano's message of "Tue, 08 Oct 2024 13:42:31 -0700")

On Okt 08 2024, Junio C Hamano wrote:

>> -       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?

The contents of $(...) is a (multiline) shell script, with the same
whitespace and newline rules as a regular script.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510  2552 DF73 E780 A9DA AEC1
"And now for something completely different."

  parent reply	other threads:[~2024-10-09 16:58 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-07 11:10 [PATCH 0/3] doc: merge-tree: improve the script example Kristoffer Haugsbakk
2024-10-07 11:10 ` [PATCH 1/3] doc: merge-tree: provide a commit message Kristoffer Haugsbakk
2024-10-07 12:02   ` Kristoffer Haugsbakk
2024-10-07 15:17   ` Elijah Newren
2024-10-07 15:23     ` Kristoffer Haugsbakk
2024-10-07 11:10 ` [PATCH 2/3] doc: merge-tree: use lower-case variables Kristoffer Haugsbakk
2024-10-07 14:58   ` Phillip Wood
2024-10-07 15:22     ` Elijah Newren
2024-10-07 11:10 ` [PATCH 3/3] doc: merge-tree: use || directly Kristoffer Haugsbakk
2024-10-07 15:24   ` Elijah Newren
2024-10-07 15:44     ` Kristoffer Haugsbakk
2024-10-07 14:59 ` [PATCH 0/3] doc: merge-tree: improve the script example Phillip Wood
2024-10-07 15:00   ` Kristoffer Haugsbakk
2024-10-08 19:06 ` [PATCH v2 0/2] " Kristoffer Haugsbakk
2024-10-08 19:06   ` [PATCH v2 1/2] doc: merge-tree: provide a commit message Kristoffer Haugsbakk
2024-10-08 20:42     ` Junio C Hamano
2024-10-08 20:44       ` Kristoffer Haugsbakk
2024-10-09 16:35       ` Kristoffer Haugsbakk
2024-10-09 17:38         ` Junio C Hamano
2024-10-09 16:58       ` Andreas Schwab [this message]
2024-10-08 19:06   ` [PATCH v2 2/2] doc: merge-tree: use || directly Kristoffer Haugsbakk
2024-10-08 20:44     ` Junio C Hamano
2024-10-08 20:48       ` Kristoffer Haugsbakk
2024-10-09 16:53   ` [PATCH v3 0/1] doc: merge-tree: improve the script example Kristoffer Haugsbakk
2024-10-09 16:53     ` [PATCH v3 1/1] doc: merge-tree: improve example script Kristoffer Haugsbakk
2024-10-09 20:50     ` [PATCH v3 0/1] doc: merge-tree: improve the script example Elijah Newren
2024-10-10  0:01       ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=878quxfc2h.fsf@igel.home \
    --to=schwab@linux-m68k.org \
    --cc=code@khaugsbakk.name \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=newren@gmail.com \
    --cc=sunshine@sunshineco.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).