From: Taylor Blau <me@ttaylorr.com>
Date: Mon, 31 Oct 2022 01:04:42 +0000 (-0400)
Subject: Merge branch 'pw/rebase-keep-base-fixes'
X-Git-Tag: v2.39.0-rc0~61
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=003f815dd9f42b1bb893338b32d9cce33a8926c1;p=thirdparty%2Fgit.git

Merge branch 'pw/rebase-keep-base-fixes'

"git rebase --keep-base" used to discard the commits that are
already cherry-picked to the upstream, even when "keep-base" meant
that the base, on top of which the history is being rebuilt, does
not yet include these cherry-picked commits.  The --keep-base
option now implies --reapply-cherry-picks and --no-fork-point
options.

* pw/rebase-keep-base-fixes:
  rebase --keep-base: imply --no-fork-point
  rebase --keep-base: imply --reapply-cherry-picks
  rebase: factor out branch_base calculation
  rebase: rename merge_base to branch_base
  rebase: store orig_head as a commit
  rebase: be stricter when reading state files containing oids
  t3416: set $EDITOR in subshell
  t3416: tighten two tests
---

003f815dd9f42b1bb893338b32d9cce33a8926c1
diff --cc builtin/rebase.c
index 56e4214b44,ef520f66fb..b9164a30bf
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@@ -298,9 -297,8 +298,8 @@@ static int do_interactive_rebase(struc
  		split_exec_commands(opts->cmd, &commands);
  		ret = complete_action(the_repository, &replay, flags,
  			shortrevisions, opts->onto_name, opts->onto,
- 			&opts->orig_head, &commands, opts->autosquash,
- 			opts->update_refs,
- 			&todo_list);
+ 			&opts->orig_head->object.oid, &commands,
 -			opts->autosquash, &todo_list);
++			opts->autosquash, opts->update_refs, &todo_list);
  	}
  
  	string_list_clear(&commands, 0);