git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Re* git pull --rebase should use fast forward merge if possible

From
Junio C Hamano <gitster@pobox.com>
Date
Dec 1, 2016, 18:50 UTC
Message-ID
<xmqqoa0va3fw.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<CAGZ79kZSEan5uXCUn4iVCWEc9zohMSr+UDyHDyQUHz84H=tR8w@mail.gmail.com>
Stefan Beller <sbeller@google.com> writes:
Show 17 quoted lines
> 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)

This mimics the existing tests around there for consistency. Simplifying or cleaning of this test script as a whole is outside the scope.

Previous: Stefan BellerNext: Stefan Beller
Message 8 of 9 in “git pull --rebase should use fast forward merge if possible”
  1. neuling@dakosy.deJun 29, 2016
  2. Junio C HamanoJun 29, 2016
  3. Junio C HamanoJun 29, 2016
  4. Stefan BellerJun 29, 2016
  5. Junio C HamanoJun 29, 2016
  6. Re* git pull --rebase should use fast forward merge if possibleJunio C Hamano, Dec 1, 2016
  7. Stefan BellerDec 1, 2016
  8. Junio C HamanoDec 1, 2016
  9. Stefan BellerDec 1, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.