Re: [PATCH 6/8] sequencer: handle autosquash and post-rewrite for merge commands

2018-01-23 Thread Junio C Hamano
Jacob Keller writes: >> static int is_per_worktree_ref(const char *refname) >> { >> return !strcmp(refname, "HEAD") || >> - starts_with(refname, "refs/bisect/"); >> + starts_with(refname, "refs/bisect/") || >> + starts_with(refname, "refs/rewrit

Re: [PATCH 6/8] sequencer: handle autosquash and post-rewrite for merge commands

2018-01-18 Thread Jacob Keller
>> Same for the test here, I can't figure out why this is necessary in >> this patch as opposed to the patch which first introduced the >> refs/rewritten/ refs. > > Woops. This was its own commit, and must have been accidentally squashed > during one of my rebases. Will re-introduce it; Yep that m

Re: [PATCH 6/8] sequencer: handle autosquash and post-rewrite for merge commands

2018-01-18 Thread Johannes Schindelin
Hi Jake, On Thu, 18 Jan 2018, Jacob Keller wrote: > On Thu, Jan 18, 2018 at 7:35 AM, Johannes Schindelin > wrote: > > In the previous patches, we implemented the basic functionality of the > > `git rebase -i --recreate-merges` command, in particular the `merge` > > command to create merge commit

Re: [PATCH 6/8] sequencer: handle autosquash and post-rewrite for merge commands

2018-01-18 Thread Jacob Keller
On Thu, Jan 18, 2018 at 7:35 AM, Johannes Schindelin wrote: > In the previous patches, we implemented the basic functionality of the > `git rebase -i --recreate-merges` command, in particular the `merge` > command to create merge commits in the sequencer. > > The interactive rebase is a lot more t

[PATCH 6/8] sequencer: handle autosquash and post-rewrite for merge commands

2018-01-18 Thread Johannes Schindelin
In the previous patches, we implemented the basic functionality of the `git rebase -i --recreate-merges` command, in particular the `merge` command to create merge commits in the sequencer. The interactive rebase is a lot more these days, though, than a simple cherry-pick in a loop. For example, i