git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Taylor Blau <me@ttaylorr.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Documentation/howto/maintain-git.txt: fix Meta/redo-jch.sh invocation
Date: Wed, 26 Oct 2022 13:35:30 -0700	[thread overview]
Message-ID: <xmqq1qqugw6l.fsf@gitster.g> (raw)
In-Reply-To: <4ba057094ae6b1bd5c18583f23f7f99232034c72.1666815325.git.me@ttaylorr.com> (Taylor Blau's message of "Wed, 26 Oct 2022 16:15:48 -0400")

Taylor Blau <me@ttaylorr.com> writes:

> The Meta/redo-jch.sh script is generated a few lines earlier by running:
>
>     $ Meta/Reintegrate master..seen >Meta/redo-jch.sh
>
> But the resulting script is not necessarily executable. Later mentions
> of this script invoke it with sh (instead of directly), but this one is
> an odd one out.
>
> Update the documentation to invoke the Meta/redo-jch.sh script with sh
> in case the maintainer has not made the script executable.
>
> Signed-off-by: Taylor Blau <me@ttaylorr.com>
> ---
> Noticed while reading and following along with
> Documentation/howto/maintain-git.txt.

OK.  In the real life, the script gets once "chmod +x" and kept
updated by running "Meta/redo-jch.sh -u" which would update the
script in place, preserving the executable bit.  But explicitly
running it with the shell is less magical and less error-prone.


>  Documentation/howto/maintain-git.txt | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/howto/maintain-git.txt b/Documentation/howto/maintain-git.txt
> index a67130debb..215e2edb0f 100644
> --- a/Documentation/howto/maintain-git.txt
> +++ b/Documentation/howto/maintain-git.txt
> @@ -256,7 +256,7 @@ by doing the following:
>     merged to 'next', add it at the end of the list.  Then:
>
>       $ git checkout -B jch master
> -     $ Meta/redo-jch.sh -c1
> +     $ sh Meta/redo-jch.sh -c1
>
>     to rebuild the 'jch' branch from scratch.  "-c1" tells the script
>     to stop merging at the first line that begins with '###'
> --
> 2.38.0.16.g393fd4c6db

      reply	other threads:[~2022-10-26 20:35 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-26 20:15 [PATCH] Documentation/howto/maintain-git.txt: fix Meta/redo-jch.sh invocation Taylor Blau
2022-10-26 20:35 ` Junio C Hamano [this message]

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

  List information: http://vger.kernel.org/majordomo-info.html

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

  git send-email \
    --in-reply-to=xmqq1qqugw6l.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=me@ttaylorr.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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).