From: Stefan Beller <sbeller@google.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>, neuling@dakosy.de
Subject: Re: Re* git pull --rebase should use fast forward merge if possible
Date: Thu, 1 Dec 2016 10:24:49 -0800 [thread overview]
Message-ID: <CAGZ79kZSEan5uXCUn4iVCWEc9zohMSr+UDyHDyQUHz84H=tR8w@mail.gmail.com> (raw)
In-Reply-To: <xmqqa8cfbkeq.fsf_-_@gitster.mtv.corp.google.com>
On Thu, Dec 1, 2016 at 9:59 AM, Junio C Hamano <gitster@pobox.com> wrote:
> +test_expect_success '--rebase fast forward' '
> + git reset --hard before-rebase &&
> + git checkout -b ff &&
> + echo another modification >file &&
> + git commit -m third file &&
> +
> + git checkout to-rebase &&
> + git pull --rebase . ff &&
> + test "$(git rev-parse HEAD)" = "$(git rev-parse ff)" &&
> +
> + # The above only validates the result. Did we actually bypass rebase?
Good catch for the test, but I think we can make the sed regexp simpler, as we
can leave out the second "[0-9a-f]"? (git reflog |sed
"s/^[0-9a-f]*/OBJID/" works here)
The implication of that we'd also match if there is no object id at
all at the beginning,
which sounds fine.
I shortly debated the idea to just cut off anything before the first
space and then expect
"HEAD@{0}: pull --rebase . ff: Fast-forward" only, but why cut off
what we produce
in the first place?
git reflog --format="%s" -1 >actual &&
echo "pull --rebase . ff: Fast-forward" >expect &&
test_cmp expect actual
maybe?
next prev parent reply other threads:[~2016-12-01 18:24 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
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 [this message]
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='CAGZ79kZSEan5uXCUn4iVCWEc9zohMSr+UDyHDyQUHz84H=tR8w@mail.gmail.com' \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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).