Re: [PATCH] rebase -i: avoid --cherry-pick when rebasing to a direct ancestor
On Saturday 20 February 2010 00:30:52 Thomas Rast wrote:
Show 8 quoted lines
> Ordinary 'rebase -i' reads the commits to rebase with (roughly)
>
> git rev-list --left-right --cherry-pick $upstream...
>
> which gives it the feature of skipping commits that are already
> present in $upstream. However, in the common use-case of rewriting a
> few commits up to an ancestor, as in 'git rebase -i HEAD~3', the
> --cherry-pick is useless since there are no commits to compare to.
> The --cherry-pick mechanism itself could get a similar optimization,
> but I don't know that code.
Or maybe it's as simple as this?
diff --git i/revision.c w/revision.c
index 438cc87..29721ec 100644
--- i/revision.c
+++ w/revision.c
@@ -547,6 +547,9 @@ static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
right_count++;
}
+ if (!left_count || !right_count)
+ return;
+
left_first = left_count < right_count;
init_patch_ids(&ids);
if (revs->diffopt.nr_paths) {
--
Thomas Rast
trast@{inf,student}.ethz.chThomas Rast <trast@student.ethz.ch>