Re: [PATCH 6/8] sequencer: handle autosquash and post-rewrite for merge commands
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jan 23, 2018, 20:27 UTC
- Message-ID
- <xmqq1siggw2t.fsf@gitster.mtv.corp.google.com>
- In-Reply-To
- <CA+P7+xr0FpgTUa9SgkXM1U86i8f0cParNqGkP=KNPOR_EqNHYg@mail.gmail.com>
Jacob Keller <jacob.keller@gmail.com> writes:
Show 11 quoted lines
>> 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/rewritten/");
>> }
>
> Would this part make more sense to move into the commit that
> introduces writing these refs, or does it only matter once you start
> this step here?Good spotting. I too was wondering about multiple worktrees when I saw the "label" thing introduced. It probably makes sense to move this to that step.