subject:"\[PATCH v2\] pull\: ff \-\-rebase \-\-autostash works in dirty repo"

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

2017-05-31 Thread Junio C Hamano

Tyler Brazier 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

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

2017-05-30 Thread Tyler Brazier

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