On Fri, Apr 22, 2016 at 9:01 AM, Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx> wrote:
> Similar to the rebase case, we want to detect if "HEAD" in some worktree
> is being bisected because
>
> 1) we do not want to checkout this branch in another worktree, after
> bisect is done it will want to go back to this branch
>
> 2) we do not want to delete the branch is either or git bisect will
> fail to return to the (long gone) branch
I'm very far behind with my reviews and I see that this series is
already in 'next', so perhaps these comments are too late...
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx>
> ---
> diff --git a/t/t2025-worktree-add.sh b/t/t2025-worktree-add.sh
> @@ -263,4 +263,17 @@ test_expect_success 'check out from current worktree branch ok' '
> +test_expect_success 'checkout a branch under bisect' '
> + git worktree add under-bisect &&
> + (
> + cd under-bisect &&
> + git bisect start &&
> + git bisect bad &&
> + git bisect good HEAD~2 &&
> + git worktree list | grep "under-bisect.*detached HEAD" &&
> + test_must_fail git worktree add new-bisect under-bisect &&
Nit: I realize that the checking 'worktree add' is sufficient, but
it's a bit confusing to read in the commit message about how deleting
the branch would be bad, but then see it testing only 'add'.
> + ! test -d new-bisect
> + )
> +'
> diff --git a/worktree.c b/worktree.c
> @@ -234,6 +234,21 @@ static int is_worktree_being_rebased(const struct worktree *wt,
> +static int is_worktree_being_bisected(const struct worktree *wt,
> + const char *target)
> +{
> + struct wt_status_state state;
> + int found_rebase;
s/rebase/bisect/ perhaps?
> + memset(&state, 0, sizeof(state));
> + found_rebase = wt_status_check_bisect(wt, &state) &&
> + state.branch &&
> + starts_with(target, "refs/heads/") &&
> + !strcmp(state.branch, target + strlen("refs/heads/"));
> + free(state.branch);
> + return found_rebase;
> +}
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html