[v2,1/2] rebase -i: clarify what happens on a failed `exec`
diff mbox series

Message ID 2eefdb4874d36f14aac79b24c0f6216911f2143e.1539161632.git.gitgitgadget@gmail.com
State New
Headers show
Series
  • rebase -i: introduce the 'break' command
Related show

Commit Message

Ben Keene via GitGitGadget Oct. 10, 2018, 8:53 a.m. UTC
From: Johannes Schindelin <johannes.schindelin@gmx.de>

We had not documented previously what happens when an `exec` command in
an interactive rebase fails. Now we do.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 Documentation/git-rebase.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Eric Sunshine Oct. 10, 2018, 9:46 a.m. UTC | #1
On Wed, Oct 10, 2018 at 4:54 AM Johannes Schindelin via GitGitGadget
<gitgitgadget@gmail.com> wrote:
> We had not documented previously what happens when an `exec` command in
> an interactive rebase fails. Now we do.
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
> diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
> @@ -420,7 +420,8 @@ idea unless you know what you are doing (see BUGS below).
>  --exec <cmd>::
>         Append "exec <cmd>" after each line creating a commit in the
>         final history. <cmd> will be interpreted as one or more shell
> -       commands.
> +       commands. Anz command that fails will interrupt the rebase,
> +       withe exit code 1.

s/Anz/Any/
s/withe/with/
Junio C Hamano Oct. 11, 2018, 8:15 a.m. UTC | #2
Eric Sunshine <sunshine@sunshineco.com> writes:

> On Wed, Oct 10, 2018 at 4:54 AM Johannes Schindelin via GitGitGadget
> <gitgitgadget@gmail.com> wrote:
>> We had not documented previously what happens when an `exec` command in
>> an interactive rebase fails. Now we do.
>>
>> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
>> ---
>> diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
>> @@ -420,7 +420,8 @@ idea unless you know what you are doing (see BUGS below).
>>  --exec <cmd>::
>>         Append "exec <cmd>" after each line creating a commit in the
>>         final history. <cmd> will be interpreted as one or more shell
>> -       commands.
>> +       commands. Anz command that fails will interrupt the rebase,
>> +       withe exit code 1.
>
> s/Anz/Any/
> s/withe/with/

Heh, I know I am not good at spelling, either, but hopefully I am a
bit more careful than leaving as many typoes as I have added lines
in my patch X-<.  After all, it's not a race to send in patches as
quickly as possible.

Queued.  Thanks, both.
Johannes Schindelin Oct. 12, 2018, 8:36 a.m. UTC | #3
Hi Junio & Eric,

On Thu, 11 Oct 2018, Junio C Hamano wrote:

> Eric Sunshine <sunshine@sunshineco.com> writes:
> 
> > On Wed, Oct 10, 2018 at 4:54 AM Johannes Schindelin via GitGitGadget
> > <gitgitgadget@gmail.com> wrote:
> >> We had not documented previously what happens when an `exec` command in
> >> an interactive rebase fails. Now we do.
> >>
> >> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> >> ---
> >> diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
> >> @@ -420,7 +420,8 @@ idea unless you know what you are doing (see BUGS below).
> >>  --exec <cmd>::
> >>         Append "exec <cmd>" after each line creating a commit in the
> >>         final history. <cmd> will be interpreted as one or more shell
> >> -       commands.
> >> +       commands. Anz command that fails will interrupt the rebase,
> >> +       withe exit code 1.
> >
> > s/Anz/Any/
> > s/withe/with/

These tyopes will be fxied in the nxet itaretion.

Ciao,
Dhsco

> 
> Heh, I know I am not good at spelling, either, but hopefully I am a
> bit more careful than leaving as many typoes as I have added lines
> in my patch X-<.  After all, it's not a race to send in patches as
> quickly as possible.
> 
> Queued.  Thanks, both.
>

Patch
diff mbox series

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 091eb53faa..db2faca73c 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -420,7 +420,8 @@  idea unless you know what you are doing (see BUGS below).
 --exec <cmd>::
 	Append "exec <cmd>" after each line creating a commit in the
 	final history. <cmd> will be interpreted as one or more shell
-	commands.
+	commands. Anz command that fails will interrupt the rebase,
+	withe exit code 1.
 +
 You may execute several commands by either using one instance of `--exec`
 with several commands: