Signed-off-by: Nguyễn Thái Ngọc Duy <[email protected]>
---
builtin/worktree.c | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/builtin/worktree.c b/builtin/worktree.c
index 475b958..2ec9c36 100644
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -184,6 +184,37 @@ static const char *worktree_basename(const char *path, int
*olen)
return name;
}
+static int git_config_set_int(const char *key, int value)
+{
+ struct strbuf sb = STRBUF_INIT;
+ int ret;
+
+ strbuf_addf(&sb, "%d", value);
+ ret = git_config_set(key, sb.buf);
+ strbuf_release(&sb);
+ return ret;
+}
+
+static void upgrade_worktree_version(void)
+{
+ if (repository_format_worktree_version != 0)
+ /*
+ * XXX: anything else to do when upgrading from
+ * version X to Y? Also, the user may want to stick to
+ * a particular version if multiple git versions
+ * operate on this repo. In that case, do not
+ * automatically bump version up.
+ */
+ return;
+ repository_format_worktree_version = 1;
+ if (repository_format_version < 2)
+ repository_format_version = 2;
+ git_config_set_int("core.repositoryformatversion",
+ repository_format_version);
+ git_config_set_int("extensions.worktree",
+ repository_format_worktree_version);
+}
+
static int add_worktree(const char *path, const char *refname,
const struct add_opts *opts)
{
@@ -268,6 +299,8 @@ static int add_worktree(const char *path, const char
*refname,
strbuf_addf(&sb, "%s/commondir", sb_repo.buf);
write_file(sb.buf, "../..");
+ upgrade_worktree_version();
+
fprintf_ln(stderr, _("Preparing %s (identifier %s)"), path, name);
argv_array_pushf(&child_env, "%s=%s", GIT_DIR_ENVIRONMENT, sb_git.buf);
--
2.3.0.rc1.137.g477eb31
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
