[PATCH v2 3/5] refs: add create_symref_common_dir as a variation of create_symref
- From
Kazuki Yamaguchi <k@rhe.jp>
- Date
- Mar 25, 2016, 18:28 UTC
- Message-ID
- <1d91378d1f1e994ccc69d5c6ef4f0d5332d37eec.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