mbox series

[v2,0/2] rebase -i: introduce the 'break' command

Message ID pull.43.v2.git.gitgitgadget@gmail.com (mailing list archive)
Headers show
Series rebase -i: introduce the 'break' command | expand

Message

Johannes Schindelin via GitGitGadget Oct. 10, 2018, 8:53 a.m. UTC 
Stefan asked a while back
[https://public-inbox.org/git/20180118183618.39853-3-sbeller@google.com/] 
for a todo command in interactive rebases that would essentially perform the
"stop" part of the edit command, but without the "pick" part: interrupt the
interactive rebase, with exit code 0, letting the user do things and stuff
and look around, with the idea of continuing the rebase later (using git
rebase --continue).

This patch introduces that, based on ag/rebase-i-in-c.

Changes since v1:

 * Wrapped the commit message correctly.
 * Added a preparatory patch to mention what happens in case an exec fails.
 * Mentioned the break command in the git-rebase(1) documentation.

Johannes Schindelin (2):
  rebase -i: clarify what happens on a failed `exec`
  rebase -i: introduce the 'break' command

 Documentation/git-rebase.txt | 6 +++++-
 rebase-interactive.c         | 1 +
 sequencer.c                  | 7 ++++++-
 t/lib-rebase.sh              | 2 +-
 t/t3418-rebase-continue.sh   | 9 +++++++++
 5 files changed, 22 insertions(+), 3 deletions(-)


base-commit: 34b47315d9721a576b9536492cca0c11588113a2
Published-As: https://github.com/gitgitgadget/git/releases/tags/pr-43%2Fdscho%2Frebase-i-break-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-43/dscho/rebase-i-break-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/43

Range-diff vs v1:

 -:  ---------- > 1:  2eefdb4874 rebase -i: clarify what happens on a failed `exec`
 1:  b358178548 ! 2:  c74e02c4b6 rebase -i: introduce the 'break' command
     @@ -11,11 +11,26 @@
          before cherry-picking a commit, or immediately after an 'exec' or a
          'merge'.
      
     -    This commit introduces that functionality, as the spanking new 'break' command.
     +    This commit introduces that functionality, as the spanking new 'break'
     +    command.
      
          Suggested-by: Stefan Beller <sbeller@google.com>
          Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
      
     +diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
     +--- a/Documentation/git-rebase.txt
     ++++ b/Documentation/git-rebase.txt
     +@@
     + the files and/or the commit message, amend the commit, and continue
     + rebasing.
     + 
     ++To interrupt the rebase (just like an "edit" command would do, but without
     ++cherry-picking any commit first), use the "break" command.
     ++
     + If you just want to edit the commit message for a commit, replace the
     + command "pick" with the command "reword".
     + 
     +
      diff --git a/rebase-interactive.c b/rebase-interactive.c
      --- a/rebase-interactive.c
      +++ b/rebase-interactive.c