Re: [PATCH] branch: update all per-worktree HEADs when renaming a branch
- From
Eric Sunshine <sunshine@sunshineco.com>
- Date
- Mar 21, 2016, 17:41 UTC
- Message-ID
- <CAPig+cRQj4td82DuqL0tD=3znLAmT4nBrfOjK3phqM7iomQseA@mail.gmail.com>
- In-Reply-To
- <1458553816-29091-1-git-send-email-k@rhe.jp>
On Mon, Mar 21, 2016 at 5:50 AM, Kazuki Yamaguchi <k@rhe.jp> wrote:
Show 8 quoted lines
> When renaming a branch, the current code only updates the current > working tree's HEAD, but it should update .git/HEAD of all checked out > working trees. > > This is the current behavior, /path/to/wt's HEAD is not updated: > [...] > This patch fixes this issue by updating all relevant worktree HEADs > when renaming a branch.
Makes sense; seems like a genuine problem. Some comment below...
Show 15 quoted lines
> Signed-off-by: Kazuki Yamaguchi <k@rhe.jp> > --- > diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh > @@ -126,7 +126,19 @@ test_expect_success 'git branch -M foo bar should fail when bar is checked out' > test_expect_success 'git branch -M baz bam should succeed when baz is checked out' ' > +test_expect_success 'git branch -M baz bam should succeed when baz is checked out as linked working tree' ' > + git checkout master && > + git branch && > + git worktree add -b baz bazdir && > + git branch -M baz bam && > + ( > + cd bazdir && > + test $(git rev-parse --abbrev-ref HEAD) = bam > + ) > '
This can be done more easily without the subshell:
test $(git -C bazdir rev-parse ...) = bam
Can you also expand the test so that it verifies that the rename works as expected when the branch is checked out in multiple worktrees, rather than just one. Likewise, it would be nice to check branch rename from within a worktree in which the branch is checked out (in addition to the test above which does the rename from outside such a worktree).
More below...
Show 29 quoted lines
> diff --git a/worktree.c b/worktree.c
> @@ -217,3 +217,41 @@ char *find_shared_symref(const char *symref, const char *target)
> +int update_worktrees_head_symref(const char *oldref, const char *newref)
> +{
> + int error = 0;
> + struct strbuf path = STRBUF_INIT;
> + struct strbuf origref = STRBUF_INIT;
> + int i;
> + struct worktree **worktrees = get_worktrees();
> +
> + for (i = 0; worktrees[i]; i++) {
> + if (worktrees[i]->is_detached)
> + continue;
> +
> + strbuf_reset(&path);
> + strbuf_reset(&origref);
> + strbuf_addf(&path, "%s/HEAD", worktrees[i]->git_dir);
> +
> + if (parse_ref(path.buf, &origref, NULL))
> + continue;
> +
> + if (!strcmp(origref.buf, oldref)) {
> + int prefix_len = strlen(absolute_path(get_git_common_dir())) + 1;
> + const char *symref = path.buf + prefix_len;
> +
> + /* no need to pass logmsg here as HEAD didn't really move */
> + if (create_symref(symref, newref, NULL)) {
> + error = -1;
> + break;Is aborting upon the first error desired behavior? (Genuine question.) Would it make more sense to continue attempting the rename for the remaining worktrees (and remember that an error was encountered)? Related: Since you're now dealing with multiple worktrees, you can do a better job of letting the user know in which worktree something went wrong rather than merely emitting the relatively generic "Branch renamed to %s, but HEAD is not updated!".
More below...
Show 18 quoted lines
> + } > + } > + } > + > + strbuf_release(&path); > + strbuf_release(&origref); > + free_worktrees(worktrees); > + > + return error; > +} > diff --git a/worktree.h b/worktree.h > @@ -35,4 +35,11 @@ extern void free_worktrees(struct worktree **); > +/* > + * Update all per-worktree HEADs pointing the old ref to point the new ref. > + * This will be used when renaming a branch. Returns 0 if successful, > + * non-zero otherwise. > + */ > +extern int update_worktrees_head_symref(const char *, const char *);
I guess I can understand the desire to libify this functionality, however, it feels as if it is a feature of "branch" rather than "worktree", hence perhaps it should reside in top-level branch.[hc]?