git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
* [PATCH] Documentation/howto/maintain-git.txt: fix Meta/redo-jch.sh invocation
@ 2022-10-26 20:15 Taylor Blau
  2022-10-26 20:35 ` Junio C Hamano
  0 siblings, 1 reply; 2+ messages in thread
From: Taylor Blau @ 2022-10-26 20:15 UTC (permalink / raw)
  To: git, git; +Cc: Junio C Hamano

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.

 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

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] Documentation/howto/maintain-git.txt: fix Meta/redo-jch.sh invocation
  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
  0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2022-10-26 20:35 UTC (permalink / raw)
  To: Taylor Blau; +Cc: git

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-10-26 20:35 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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

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).