Skip to content

rebase: a couple of fixup fixes

Phillip Wood git 2 versions – New

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest2 patches 0 repliesNew
  2. v12 patches 4 repliesSuperseded

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/2rebase -i: fix counting of fixups after rebase --skipsequencer.c t/t3418-rebase-continue.sh+42 -50 replies
2/2rebase: remember fixup -c after skipping fixup/squashsequencer.c t/t3437-rebase-fixup-options.sh+63 -40 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

Cover letter [PATCH v2 0/2] rebase: a couple of fixup fixes

These patches fix a couple of small bugs in the way skipped "fixup" and "squash" commands are handled. A skipped command can lead to an incorrect commit count in the template message which is fixed in patch 1. It can also mean we fail to open the editor after a "fixup -c" command which is fixed in patch 2

Thanks for the comments on V1. The only change here is to make sure a character non-NUL when we're checking if it isn't a LF in patch 1 as suggested by Junio.

base-commit: 9a0c4701dcd5725c4184599322b52933ff5005ca
Published-As: https://github.com/phillipwood/git/releases/tag/pw%2Frebase-fixup-fixes-part-1%2Fv2
View-Changes-At: https://github.com/phillipwood/git/compare/9a0c4701d...3089979e2
Fetch-It-Via: git fetch https://github.com/phillipwood/git pw/rebase-fixup-fixes-part-1/v2

Phillip Wood (2):
rebase -i: fix counting of fixups after rebase --skip
rebase: remember fixup -c after skipping fixup/squash

 sequencer.c                     | 31 ++++++++++++++++++----
 t/t3418-rebase-continue.sh      | 36 ++++++++++++++++++++++---
 t/t3437-rebase-fixup-options.sh | 47 +++++++++++++++++++++++++++++++++
 3 files changed, 105 insertions(+), 9 deletions(-)

Range-diff against v1:
1: c37a518486a ! 1: f95668512a8 rebase -i: fix counting of fixups after rebase --skip

    @@ sequencer.c: static int read_populate_opts(struct replay_opts *opts)
     +				 * inserted blank lines when a fixup
     +				 * was skipped.
     +				 */
    -+				if (p[1] != '\n')
    ++				if (p[1] && p[1] != '\n')
     +					ctx->current_fixup_count++;
      				p++;
      			}

2: 7c8075ff267 = 2: 3089979e2da rebase: remember fixup -c after skipping fixup/squash

Signature · 1 line
2.54.0.200.gfd8d68259e3