diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2016-04-22 20:01:36 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-22 14:09:39 -0700 |
| commit | 14ace5b77b493506a1f8ffde96a2f49cc7bc4db0 (patch) | |
| tree | 50c5dee66f1f65027675b1d2e187fc418f2831e6 /worktree.c | |
| parent | 04a3dfb8b5993fcb807fcbca8ed7ea608d30a204 (diff) | |
| download | git-14ace5b77b493506a1f8ffde96a2f49cc7bc4db0.tar.gz git-14ace5b77b493506a1f8ffde96a2f49cc7bc4db0.tar.xz | |
branch: do not rename a branch under bisect or rebase
The branch name in that case could be saved in rebase's head_name or
bisect's BISECT_START files. Ideally we should try to update them as
well. But it's trickier (*). Let's play safe and see if the user
complains about inconveniences before doing that.
(*) If we do it, bisect and rebase need to provide an API to rename
branches. We can't do it in worktree.c or builtin/branch.c because
when other people change rebase/bisect code, they may not be aware of
this code and accidentally break it (e.g. rename the branch file, or
refer to the branch in new files). It's a lot more work.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'worktree.c')
| -rw-r--r-- | worktree.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/worktree.c b/worktree.c index aab4b9552..4817d6005 100644 --- a/worktree.c +++ b/worktree.c @@ -216,8 +216,8 @@ const char *get_worktree_git_dir(const struct worktree *wt) return git_common_path("worktrees/%s", wt->id); } -static int is_worktree_being_rebased(const struct worktree *wt, - const char *target) +int is_worktree_being_rebased(const struct worktree *wt, + const char *target) { struct wt_status_state state; int found_rebase; @@ -234,8 +234,8 @@ static int is_worktree_being_rebased(const struct worktree *wt, return found_rebase; } -static int is_worktree_being_bisected(const struct worktree *wt, - const char *target) +int is_worktree_being_bisected(const struct worktree *wt, + const char *target) { struct wt_status_state state; int found_rebase; |