From: Kazuki Yamaguchi <k@rhe.jp>
To: git@vger.kernel.org
Cc: Eric Sunshine <sunshine@sunshineco.com>,
Duy Nguyen <pclouds@gmail.com>, Kazuki Yamaguchi <k@rhe.jp>
Subject: [PATCH v2 3/5] refs: add create_symref_common_dir as a variation of create_symref
Date: Sat, 26 Mar 2016 03:28:21 +0900 [thread overview]
Message-ID: <1d91378d1f1e994ccc69d5c6ef4f0d5332d37eec.1458927521.git.k@rhe.jp> (raw)
In-Reply-To: <cover.1458927521.git.k@rhe.jp>
In-Reply-To: <cover.1458927521.git.k@rhe.jp>
Add a new function create_symref_common_dir. This function passes
REF_COMMON_DIR to lock_ref_sha1_basic, unlike create_symref, so to make
it possible to update main working tree's per-worktree symbolic refs
(HEAD) when we are in a linked working tree.
Assume we have a linked working tree and we are in it. If we call
create_symref("HEAD", "refs/heads/branch-a", NULL), this updates the
working tree's HEAD, located at .git/worktrees/tree-a/HEAD, rather than
the main working tree's HEAD, .git/HEAD.
The new function create_symref_common_dir always updates the main
working tree's HEAD regardless of where we are.
This will be needed when renaming a branch.
Signed-off-by: Kazuki Yamaguchi <k@rhe.jp>
---
refs.h | 3 +++
refs/files-backend.c | 17 ++++++++++++++---
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/refs.h b/refs.h
index dc4782241e49..ff8dbbe1a0e5 100644
--- a/refs.h
+++ b/refs.h
@@ -312,7 +312,10 @@ extern char *shorten_unambiguous_ref(const char *refname, int strict);
/** rename ref, return 0 on success **/
extern int rename_ref(const char *oldref, const char *newref, const char *logmsg);
+/* create or update a symref */
extern int create_symref(const char *refname, const char *target, const char *logmsg);
+/* same as create_symref, but refname is always $GIT_COMMON_DIR/refname */
+extern int create_symref_common_dir(const char *refname, const char *target, const char *logmsg);
enum action_on_err {
UPDATE_REFS_MSG_ON_ERR,
diff --git a/refs/files-backend.c b/refs/files-backend.c
index 2a808d520213..1fe4d4e75188 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -2886,14 +2886,15 @@ static int create_symref_locked(struct ref_lock *lock, const char *refname,
return 0;
}
-int create_symref(const char *refname, const char *target, const char *logmsg)
+static int create_symref_internal(const char *refname, const char *target,
+ const char *logmsg, unsigned int flags)
{
struct strbuf err = STRBUF_INIT;
struct ref_lock *lock;
int ret;
- lock = lock_ref_sha1_basic(refname, NULL, NULL, NULL, REF_NODEREF, NULL,
- &err);
+ lock = lock_ref_sha1_basic(refname, NULL, NULL, NULL, REF_NODEREF | flags,
+ NULL, &err);
if (!lock) {
error("%s", err.buf);
strbuf_release(&err);
@@ -2905,6 +2906,16 @@ int create_symref(const char *refname, const char *target, const char *logmsg)
return ret;
}
+int create_symref(const char *refname, const char *target, const char *logmsg)
+{
+ return create_symref_internal(refname, target, logmsg, 0);
+}
+
+int create_symref_common_dir(const char *refname, const char *target, const char *logmsg)
+{
+ return create_symref_internal(refname, target, logmsg, REF_COMMON_DIR);
+}
+
int reflog_exists(const char *refname)
{
struct stat st;
--
2.8.0.rc4.21.g05df949
next prev parent reply other threads:[~2016-03-25 18:29 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 ` Kazuki Yamaguchi [this message]
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
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=1d91378d1f1e994ccc69d5c6ef4f0d5332d37eec.1458927521.git.k@rhe.jp \
--to=k@rhe.jp \
--cc=git@vger.kernel.org \
--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).