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

Re: [PATCH v2] pull: ff --rebase --autostash works in dirty repo

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 1, 2017, 01:52 UTC
Message-ID
<xmqqbmq88oeu.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<0102015c5c7054ac-5ec72a28-ff81-42b8-8224-26a588cef485-000000@eu-west-1.amazonses.com>
Tyler Brazier <tyler@tylerbrazier.com> writes:
Show 10 quoted lines
> When `git pull --rebase --autostash` in a dirty repository resulted in a
> fast-forward, nothing was being autostashed and the pull failed. This
> was due to a shortcut to avoid running rebase when we can fast-forward,
> but autostash is ignored on that codepath.
>
> Now we will only take the shortcut if autostash is not in effect.
> Based on a few tests against the git.git repo, the shortcut does not
> seem to give us significant performance benefits, on Linux at least.
> Regardless, it is more important to be correct than to be fast.
> ---
Missing sign-off.
Otherwise, nicely done.  Thanks.
Previous: Tyler BrazierNext: Tyler Brazier
Message 4 of 6 in “pull: ff --rebase --autostash works in dirty repo”
  1. pull: ff --rebase --autostash works in dirty repoTyler Brazier, May 28, 2017
  2. Junio C HamanoMay 29, 2017
  3. pull: ff --rebase --autostash works in dirty repoTyler Brazier, May 31, 2017
  4. Junio C HamanoJun 1, 2017
  5. pull: ff --rebase --autostash works in dirty repoTyler Brazier, Jun 1, 2017
  6. Junio C HamanoJun 1, 2017

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.