[PATCH v2] rebase: introduce --update-branches option

2019-09-07 Thread Warren He
rewritten versions of those commits. Signed-off-by: Warren He --- Documentation/git-rebase.txt | 9 builtin/rebase.c | 11 - sequencer.c | 58 +++- sequencer.h | 6 ++- t/t3431-rebase-update

[PATCH v2] rebase: introduce --update-branches option

2019-09-07 Thread Warren He
to combine this with the existing `label` command. So far it sounds like we generally want to be more willing to skip branch updates while performing the rebase, with aforementioned scenarios where something else updates the branch before we do, or if the branch becomes checked out in a worktree.

Re: [PATCH] rebase: introduce --update-branches option

2019-09-07 Thread Warren He
Phillip, thanks for the comments. Indeed other branches that are not in the todo list are still not updated. I'm collecting the arguments about deferring the branch updates and issue with worktrees for discussion along with Johannes's review.

Re: [PATCH] rebase: introduce --update-branches option

2019-09-07 Thread Warren He
Brian, thanks for looking. The only thing I can come up with to say about having lots of refs is that at least that part of this isn't brand new code. The part that collects ref info uses the same routines as `git log --decorate`. Do you recall how long that took in the repository with 80,000 refs?

[PATCH] rebase: introduce --update-branches option

2019-09-02 Thread Warren He
rewritten versions of those commits. Signed-off-by: Warren He --- Documentation/git-rebase.txt | 8 + builtin/rebase.c | 13 ++-- sequencer.c | 68 ++- sequencer.h | 6 ++-- t/t3431

[PATCH] rebase: introduce --update-branches option

2019-09-02 Thread Warren He
anch -f feat-f merge -C e50066c G # G exec git branch -f interim pick 539e556 H ``` Warren He (1): rebase: introduce --update-branches option Documentation/git-rebase.txt | 8 + builtin/rebase.c | 13 ++-- sequencer.c