From: Kazuki Yamaguchi <k@rhe.jp>
To: Eric Sunshine <sunshine@sunshineco.com>
Cc: Git List <git@vger.kernel.org>, Duy Nguyen <pclouds@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
Michael Haggerty <mhagger@alum.mit.edu>
Subject: Re: [PATCH v3 1/2] refs: add a new function set_worktree_head_symref
Date: Fri, 8 Apr 2016 15:37:13 +0900 [thread overview]
Message-ID: <20160408063713.GA17696@chikuwa.rhe.jp> (raw)
In-Reply-To: <CAPig+cQym57U-izza5_Hn0xCDcG0MHFMcWJFc==ohKnr7acFWQ@mail.gmail.com>
On Thu, Apr 07, 2016 at 05:20:10PM -0400, Eric Sunshine wrote:
> On Sun, Mar 27, 2016 at 10:37 AM, Kazuki Yamaguchi <k@rhe.jp> wrote:
> > Add a new function set_worktree_head_symref, to update HEAD symref for
> > the specified worktree.
> >
> > To update HEAD of a linked working tree,
> > create_symref("worktrees/$work_tree/HEAD", "refs/heads/$branch", msg)
> > could be used. However when it comes to updating HEAD of the main
> > working tree, it is unusable because it uses $GIT_DIR for
> > worktree-specific symrefs (HEAD).
> >
> > The new function takes git_dir (real directory) as an argument, and
> > updates HEAD of the working tree. This function will be used when
> > renaming a branch.
> >
> > Signed-off-by: Kazuki Yamaguchi <k@rhe.jp>
> > ---
> > diff --git a/refs/files-backend.c b/refs/files-backend.c
> > @@ -2894,6 +2894,41 @@ int create_symref(const char *refname, const char *target, const char *logmsg)
> > +int set_worktree_head_symref(const char *gitdir, const char *target)
> > +{
> > + static struct lock_file head_lock;
> > + struct ref_lock *lock;
> > + struct strbuf err = STRBUF_INIT;
> > + struct strbuf head_path = STRBUF_INIT;
> > + const char *head_rel;
> > + int ret;
> > +
> > + strbuf_addf(&head_path, "%s/HEAD", absolute_path(gitdir));
> > + if (hold_lock_file_for_update(&head_lock, head_path.buf,
> > + LOCK_NO_DEREF) < 0) {
> > + error("%s", err.buf);
>
> 'err' has not been populated at this point, so I suspect that this
> error message is likely to be rather uninformative.
Yes, unable_to_lock_message() is missing. Thank you for pointing it out.
>
> > + strbuf_release(&err);
> > + strbuf_release(&head_path);
> > + return -1;
> > + }
> > +
> > + /* head_rel will be "HEAD" for the main tree, "worktrees/wt/HEAD" for
> > + linked trees */
> > + head_rel = remove_leading_path(head_path.buf,
> > + absolute_path(get_git_common_dir()));
> > + /* to make use of create_symref_locked(), initialize ref_lock */
> > + lock = xcalloc(1, sizeof(struct ref_lock));
> > + lock->lk = &head_lock;
> > + lock->ref_name = xstrdup(head_rel);
> > + lock->orig_ref_name = xstrdup(head_rel);
> > +
> > + ret = create_symref_locked(lock, head_rel, target, NULL);
> > +
> > + unlock_ref(lock); /* will free lock */
> > + strbuf_release(&head_path);
> > + return ret;
> > +}
> > +
next prev parent reply other threads:[~2016-04-08 6:37 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-21 9:50 [PATCH] branch: update all per-worktree HEADs when renaming a branch Kazuki Yamaguchi
2016-03-21 17:41 ` Eric Sunshine
2016-03-22 0:49 ` Duy Nguyen
2016-03-25 11:56 ` Kazuki Yamaguchi
2016-03-25 11:33 ` Kazuki Yamaguchi
2016-03-25 18:28 ` [PATCH v2 0/5] branch: fix branch operations with multiple working trees Kazuki Yamaguchi
2016-03-25 21:13 ` Junio C Hamano
2016-03-27 7:29 ` Kazuki Yamaguchi
2016-03-25 18:28 ` [PATCH v2 1/5] refs: add new flag RESOLVE_REF_COMMON_DIR to resolve_ref_unsafe Kazuki Yamaguchi
2016-03-25 18:28 ` [PATCH v2 2/5] refs: add REF_COMMON_DIR flag Kazuki Yamaguchi
2016-03-25 18:28 ` [PATCH v2 3/5] refs: add create_symref_common_dir as a variation of create_symref Kazuki Yamaguchi
2016-03-25 18:28 ` [PATCH v2 4/5] branch -m: update all per-worktree HEADs Kazuki Yamaguchi
2016-03-25 18:28 ` [PATCH v2 5/5] branch -d: refuse deleting a branch which is currently checked out Kazuki Yamaguchi
2016-03-25 21:00 ` Junio C Hamano
2016-03-27 17:52 ` Eric Sunshine
2016-03-28 7:16 ` Kazuki Yamaguchi
2016-03-28 7:22 ` [PATCH v2] " Kazuki Yamaguchi
2016-03-28 16:51 ` Eric Sunshine
2016-03-29 9:28 ` Kazuki Yamaguchi
2016-03-29 18:47 ` Eric Sunshine
2016-03-29 9:38 ` [PATCH v3] " Kazuki Yamaguchi
2016-03-29 18:57 ` Eric Sunshine
2016-03-27 14:37 ` [PATCH v3 0/2] update all per-worktree HEADs when renaming a branch Kazuki Yamaguchi
2016-03-27 14:37 ` [PATCH v3 1/2] refs: add a new function set_worktree_head_symref Kazuki Yamaguchi
2016-03-28 17:48 ` Junio C Hamano
2016-03-29 2:23 ` David Turner
2016-04-07 21:20 ` Eric Sunshine
2016-04-08 6:37 ` Kazuki Yamaguchi [this message]
2016-04-08 6:42 ` Eric Sunshine
2016-03-27 14:37 ` [PATCH v3 2/2] branch -m: update all per-worktree HEADs Kazuki Yamaguchi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160408063713.GA17696@chikuwa.rhe.jp \
--to=k@rhe.jp \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mhagger@alum.mit.edu \
--cc=pclouds@gmail.com \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).