From: Junio C Hamano <gitster@pobox.com>
To: neuling@dakosy.de
Cc: git@vger.kernel.org
Subject: Re: git pull --rebase should use fast forward merge if possible
Date: Wed, 29 Jun 2016 09:32:21 -0700 [thread overview]
Message-ID: <xmqqd1n0552i.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <OF95D98CB6.47969C1C-ONC1257FE1.0058D980-C1257FE1.0059986D@dakosy.de> (neuling@dakosy.de's message of "Wed, 29 Jun 2016 18:18:37 +0200")
neuling@dakosy.de writes:
> since I have added "pull.rebase=preserve" to my global configuration I
> wonder why "git pull" also trys to rebase if a fast forward merge is
> possible.
>
> A fast forward merge would speed up every pull if your local branch
> contains no new commits and the remote branch is ahead. The result would
> be the same.
>
> Is it possible to change the behavior of "git pull
> --rebase=true|preserve|interactive" to use a fast forward merge if the
> remote branch is ahead and the local branch contains no new commits?
Interesting. I do not think of a reason why we shouldn't.
If we were still working in scripted Porcelain, it would have been a
five minute hack, perhaps like this.
contrib/examples/git-pull.sh | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/contrib/examples/git-pull.sh b/contrib/examples/git-pull.sh
index 6b3a03f..3648040 100755
--- a/contrib/examples/git-pull.sh
+++ b/contrib/examples/git-pull.sh
@@ -358,6 +358,14 @@ fi
if test true = "$rebase"
then
+ if git merge-base --is-ancestor "$orig_head" "$merge_head"
+ then
+ # We can just fast-forward, as "git rebase --no-ff"
+ # is nonsense.
+ git merge --ff-only "$merge_head"
+ exit
+ fi
+
o=$(git show-branch --merge-base $curr_branch $merge_head $oldremoteref)
if test "$oldremoteref" = "$o"
then
next prev parent reply other threads:[~2016-06-29 16:32 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-29 16:18 git pull --rebase should use fast forward merge if possible neuling
2016-06-29 16:32 ` Junio C Hamano [this message]
2016-06-29 17:23 ` Junio C Hamano
2016-06-29 20:40 ` Stefan Beller
2016-06-29 20:43 ` Junio C Hamano
2016-12-01 17:59 ` Re* " Junio C Hamano
2016-12-01 18:24 ` Stefan Beller
2016-12-01 18:50 ` Junio C Hamano
2016-12-01 18:51 ` Stefan Beller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqd1n0552i.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=neuling@dakosy.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).