Thread (66 messages) 66 messages, 9 authors, 2022-10-19

Re: [PATCH 5/5] rebase --keep-base: imply --no-fork-point

From: Phillip Wood <hidden>
Date: 2022-09-05 13:51:22

Hi Jonathan

On 24/08/2022 23:18, Jonathan Tan wrote:
"Phillip Wood via GitGitGadget" [off-list ref] writes:
quoted
@@ -1240,6 +1240,12 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
  			die(_("options '%s' and '%s' cannot be used together"), "--keep-base", "--onto");
  		if (options.root)
  			die(_("options '%s' and '%s' cannot be used together"), "--keep-base", "--root");
+		/*
+		 * --keep-base ignores config.forkPoint as it is confusing if
+		 * the branch base changes when using this option.
+		 */
+		if (options.fork_point < 0)
+			options.fork_point = 0;
Hmm..doesn't forkPoint decide the set of commits to be rebased, not the
point at which the new commits are created? If yes, that doesn't seem to
have much to do with --keep-base.
I think it depends a bit on how you look at it. You're right that 
--fork-point restricts the set of commits that are rebased, but it also 
effectively changes the branch base as it removes commits from the branch.

Best Wishes

Phillip
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help