{"thread":{"id":"58699","subject":"[PATCH] Documentation/howto/maintain-git.txt: fix Meta/redo-jch.sh invocation","startedAt":"2022-10-26T20:15:56Z","lastAt":"2022-10-26T20:35:35Z","messageCount":2,"participants":["Taylor Blau","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"465827","messageId":"4ba057094ae6b1bd5c18583f23f7f99232034c72.1666815325.git.me@ttaylorr.com","threadId":"58699","inReplyTo":null,"subject":"[PATCH] Documentation/howto/maintain-git.txt: fix Meta/redo-jch.sh invocation","fromName":"Taylor Blau","fromEmail":"me@ttaylorr.com","sentAt":"2022-10-26T20:15:48Z","receivedAt":"2022-10-26T20:15:56Z","isPatch":true,"sender":{"key":"me@ttaylorr.com","avatar":"https://avatars.githubusercontent.com/u/301000140?v=4"},"body":"The Meta/redo-jch.sh script is generated a few lines earlier by running:\n\n    $ Meta/Reintegrate master..seen >Meta/redo-jch.sh\n\nBut the resulting script is not necessarily executable. Later mentions\nof this script invoke it with sh (instead of directly), but this one is\nan odd one out.\n\nUpdate the documentation to invoke the Meta/redo-jch.sh script with sh\nin case the maintainer has not made the script executable.\n\nSigned-off-by: Taylor Blau <me@ttaylorr.com>\n---\nNoticed while reading and following along with\nDocumentation/howto/maintain-git.txt.\n\n Documentation/howto/maintain-git.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/howto/maintain-git.txt b/Documentation/howto/maintain-git.txt\nindex a67130debb..215e2edb0f 100644\n--- a/Documentation/howto/maintain-git.txt\n+++ b/Documentation/howto/maintain-git.txt\n@@ -256,7 +256,7 @@ by doing the following:\n    merged to 'next', add it at the end of the list.  Then:\n\n      $ git checkout -B jch master\n-     $ Meta/redo-jch.sh -c1\n+     $ sh Meta/redo-jch.sh -c1\n\n    to rebuild the 'jch' branch from scratch.  \"-c1\" tells the script\n    to stop merging at the first line that begins with '###'\n--\n2.38.0.16.g393fd4c6db\n"},{"id":"465829","messageId":"xmqq1qqugw6l.fsf@gitster.g","threadId":"58699","inReplyTo":"4ba057094ae6b1bd5c18583f23f7f99232034c72.1666815325.git.me@ttaylorr.com","subject":"Re: [PATCH] Documentation/howto/maintain-git.txt: fix Meta/redo-jch.sh invocation","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2022-10-26T20:35:30Z","receivedAt":"2022-10-26T20:35:35Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Taylor Blau <me@ttaylorr.com> writes:\n\n> The Meta/redo-jch.sh script is generated a few lines earlier by running:\n>\n>     $ Meta/Reintegrate master..seen >Meta/redo-jch.sh\n>\n> But the resulting script is not necessarily executable. Later mentions\n> of this script invoke it with sh (instead of directly), but this one is\n> an odd one out.\n>\n> Update the documentation to invoke the Meta/redo-jch.sh script with sh\n> in case the maintainer has not made the script executable.\n>\n> Signed-off-by: Taylor Blau <me@ttaylorr.com>\n> ---\n> Noticed while reading and following along with\n> Documentation/howto/maintain-git.txt.\n\nOK.  In the real life, the script gets once \"chmod +x\" and kept\nupdated by running \"Meta/redo-jch.sh -u\" which would update the\nscript in place, preserving the executable bit.  But explicitly\nrunning it with the shell is less magical and less error-prone.\n\n\n>  Documentation/howto/maintain-git.txt | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/Documentation/howto/maintain-git.txt b/Documentation/howto/maintain-git.txt\n> index a67130debb..215e2edb0f 100644\n> --- a/Documentation/howto/maintain-git.txt\n> +++ b/Documentation/howto/maintain-git.txt\n> @@ -256,7 +256,7 @@ by doing the following:\n>     merged to 'next', add it at the end of the list.  Then:\n>\n>       $ git checkout -B jch master\n> -     $ Meta/redo-jch.sh -c1\n> +     $ sh Meta/redo-jch.sh -c1\n>\n>     to rebuild the 'jch' branch from scratch.  \"-c1\" tells the script\n>     to stop merging at the first line that begins with '###'\n> --\n> 2.38.0.16.g393fd4c6db\n"}]}