Thread (1 message) 1 message, 1 author, 2017-06-01

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

From: Junio C Hamano <hidden>
Date: 2017-06-01 01:52:48

Tyler Brazier [off-list ref] writes:
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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help