[RFC/PATCH] rebase: use reflog to find common base with upstream
- From
John Keeping <john@keeping.me.uk>
- Date
- Dec 8, 2013, 20:06 UTC
- Message-ID
- <9e5fa57b027e1a5cd11a456c14f43b64f8f5386c.1386531376.git.john@keeping.me.uk>
Commit 15a147e (rebase: use @{upstream} if no upstream specified, 2011-02-09) says:
Make it default to 'git rebase @{upstream}'. That is also what
'git pull [--rebase]' defaults to, so it only makes sense that
'git rebase' defaults to the same thing.but that isn't actually the case. Since commit d44e712 (pull: support rebased upstream + fetch + pull --rebase, 2009-07-19), pull has actually chosen the most recent reflog entry which is an ancestor of the current branch if it can find one.
Change rebase so that it uses the same logic, but only when no upstream argument is given on the command line.
Signed-off-by: John Keeping <john@keeping.me.uk> --- Last time this came up [1], there was some discussion about moving the added block of code to affect upstreams given on the command line as well as when the upstream is discovered from the config. Having tried that, it has some more fallout on the test suite than I like; this pattern ends up dropping the tip commit of "side" because it's in the reflog of "master":
# start on "master" git branch side && git reset --hard HEAD^ && git checkout side && git rebase master
I wonder if it would be better to add a --fork-point argument to git-rebase and default it to true when no upstream is given on the command line.
[1] http://article.gmane.org/gmane.comp.version-control.git/236252
git-rebase.sh | 6 ++++++ t/t3400-rebase.sh | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/git-rebase.sh b/git-rebase.sh index 226752f..17801ad 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -437,6 +437,12 @@ then error_on_missing_default_upstream "rebase" "rebase" \ "against" "git rebase <branch>" fi + + fork_point=$(git merge-base --fork-point "$upstream_name" HEAD) + if test -n "$fork_point" && test "$fork_point" != "$upstream" + then + upstream=$fork_point + fi ;; *) upstream_name="$1" shift diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh index ebf93b0..998503d 100755 --- a/t/t3400-rebase.sh +++ b/t/t3400-rebase.sh @@ -134,12 +134,14 @@ test_expect_success 'fail when upstream arg is missing and not configured' ' test_must_fail git rebase ' -test_expect_success 'default to @{upstream} when upstream arg is missing' ' +test_expect_success 'default to common base in @{upstream}s reflog if no upstream arg' ' git checkout -b default topic && git config branch.default.remote . && git config branch.default.merge refs/heads/master && git rebase && - test "$(git rev-parse default~1)" = "$(git rev-parse master)" + git rev-parse --verify master >expect && + git rev-parse default~1 >actual && + test_cmp expect actual ' test_expect_success 'rebase -q is quiet' '
-- 1.8.5.226.g0d60d77