pull --rebase --autostash was failing on a fast-forward in a dirty repo
since we shortcut to run_merge(), which does not know how to autostash.
The shortcut is a performance optimization, and since rebase was
rewritten in C, it seemed okay to just bypass the shortcut if we
autostash.
---
builtin/p
Tyler Brazier writes:
> pull --rebase --autostash was failing on a fast-forward in a dirty repo
> since we shortcut to run_merge(), which does not know how to autostash.
> The shortcut is a performance optimization, and since rebase was
> rewritten in C, it seemed okay to just bypass the shortcut
2 matches
Mail list logo