git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2] rebase: Fix documentation about used shell in -x
@ 2024-01-17  8:53 Nikolay Borisov
  2024-01-17 22:38 ` Junio C Hamano
  0 siblings, 1 reply; 2+ messages in thread
From: Nikolay Borisov @ 2024-01-17  8:53 UTC (permalink / raw)
  To: git; +Cc: Nikolay Borisov

The shell used when using the -x option is erroneously documented to be
the one pointed to by the $SHELL environmental variable. This was true
when rebase was implemented as a shell script but this is no longer
true.

Signed-off-by: Nikolay Borisov <nik.borisov@suse.com>
---
 Documentation/git-rebase.txt | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 25516c45d8b8..2cd55aedc0f9 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -963,10 +963,9 @@ The interactive rebase will stop when a command fails (i.e. exits with
 non-0 status) to give you an opportunity to fix the problem. You can
 continue with `git rebase --continue`.

-The "exec" command launches the command in a shell (the one specified
-in `$SHELL`, or the default shell if `$SHELL` is not set), so you can
-use shell features (like "cd", ">", ";" ...). The command is run from
-the root of the working tree.
+The "exec" command launches the command in a shell (the default one, usually
+/bin/sh), so you can use shell features (like "cd", ">", ";" ...). The command
+is run from the root of the working tree.

 ----------------------------------
 $ git rebase -i --exec "make test"
--
2.34.1


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

* Re: [PATCH v2] rebase: Fix documentation about used shell in -x
  2024-01-17  8:53 [PATCH v2] rebase: Fix documentation about used shell in -x Nikolay Borisov
@ 2024-01-17 22:38 ` Junio C Hamano
  0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2024-01-17 22:38 UTC (permalink / raw)
  To: Nikolay Borisov; +Cc: git

Nikolay Borisov <nik.borisov@suse.com> writes:

> The shell used when using the -x option is erroneously documented to be
> the one pointed to by the $SHELL environmental variable. This was true
> when rebase was implemented as a shell script but this is no longer
> true.
>
> Signed-off-by: Nikolay Borisov <nik.borisov@suse.com>
> ---

Ah, our mails crossed, and this is much better than my "tentative"
one.  Let me replace it with this one and queue.

Thanks.

>  Documentation/git-rebase.txt | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
> index 25516c45d8b8..2cd55aedc0f9 100644
> --- a/Documentation/git-rebase.txt
> +++ b/Documentation/git-rebase.txt
> @@ -963,10 +963,9 @@ The interactive rebase will stop when a command fails (i.e. exits with
>  non-0 status) to give you an opportunity to fix the problem. You can
>  continue with `git rebase --continue`.
>
> -The "exec" command launches the command in a shell (the one specified
> -in `$SHELL`, or the default shell if `$SHELL` is not set), so you can
> -use shell features (like "cd", ">", ";" ...). The command is run from
> -the root of the working tree.
> +The "exec" command launches the command in a shell (the default one, usually
> +/bin/sh), so you can use shell features (like "cd", ">", ";" ...). The command
> +is run from the root of the working tree.
>
>  ----------------------------------
>  $ git rebase -i --exec "make test"
> --
> 2.34.1

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

end of thread, other threads:[~2024-01-17 22:38 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-17  8:53 [PATCH v2] rebase: Fix documentation about used shell in -x Nikolay Borisov
2024-01-17 22:38 ` Junio C Hamano

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