{"thread":{"id":"35908","subject":"[PATCH v3 00/25] Support multiple checkouts","startedAt":"2014-02-18T13:39:49Z","lastAt":"2014-07-07T17:32:45Z","messageCount":169,"participants":["Nguyễn Thái Ngọc Duy","Junio C Hamano","Eric Sunshine","Duy Nguyen","Philip Oakley","Torsten Bögershausen","Max Kirillov","Dennis Kaarsemaker"],"isPatch":true,"patchVersion":3,"patchTotal":25},"messages":[{"id":"234965","messageId":"1392730814-19656-1-git-send-email-pclouds@gmail.com","threadId":"35908","inReplyTo":null,"subject":"[PATCH v3 00/25] Support multiple checkouts","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2014-02-18T13:39:49Z","receivedAt":"2014-02-18T13:39:49Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"In short you can attach multiple worktrees to the same git repository\nwith \"git checkout --to \". This is basically what\ngit-new-workdir is for. Previous discussion here\n\nhttp://thread.gmane.org/gmane.comp.version-control.git/239194/focus=239581\n\nCompared to last time:\n\n- .git file format remains unchanged. It was a stupid idea to tie\n $GIT_COMMON_DIR pointer to .git file because you will have to pass\n that info another way if you don't go through .git file. Now it's\n stored in $GIT_DIR/commondir\n\n- Last time, checking out an already checked out branch will detach\n the previous checkout. Junio wanted to error out for less user\n confusion. I go with a (good, imo) compromise in this reroll: the\n new checkout detaches itself in this case, hinting where the branch\n is truly checked out so the user can go there and do things\n\nNguyễn Thái Ngọc Duy (25):\n path.c: make get_pathname() return strbuf instead of static buffer\n Convert git_snpath() to strbuf_git_path()\n path.c: rename vsnpath() to do_git_path()\n path.c: group git_path(), git_pathdup() and strbuf_git_path() together\n Make git_path() aware of file relocation in $GIT_DIR\n *.sh: respect $GIT_INDEX_FILE\n reflog: avoid constructing .lock path with git_path\n fast-import: use git_path() for accessing .git dir instead of get_git_dir()\n commit: use SEQ_DIR instead of hardcoding \"sequencer\"\n Add new environment variable $GIT_COMMON_DIR\n git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects\n *.sh: avoid hardcoding $GIT_DIR/hooks/...\n git-stash: avoid hardcoding $GIT_DIR/logs/....\n setup.c: convert is_git_directory() to use strbuf\n setup.c: detect $GIT_COMMON_DIR in is_git_directory()\n setup.c: convert check_repository_format_gently to use strbuf\n setup.c: detect $GIT_COMMON_DIR check_repository_format_gently()\n setup.c: support multi-checkout repo setup\n wrapper.c: wrapper to open a file, fprintf then close\n use new wrapper write_file() for simple file writing\n checkout: support checking out into a new working directory\n checkout: clean up half-prepared directories in --to mode\n checkout: detach if the branch is already checked out elsewhere\n prune: strategies for linked checkouts\n gc: support prune --repos\n\n Documentation/config.txt | 9 +-\n Documentation/git-checkout.txt | 34 +++++\n Documentation/git-prune.txt | 3 +\n Documentation/git-rev-parse.txt | 8 +\n Documentation/git.txt | 8 +\n Documentation/gitrepository-layout.txt | 26 ++++\n builtin/branch.c | 4 +-\n builtin/checkout.c | 272 +++++++++++++++++++++++++++++++--\n builtin/commit.c | 2 +-\n builtin/gc.c | 17 +++\n builtin/init-db.c | 7 +-\n builtin/prune.c | 75 +++++++++\n builtin/reflog.c | 2 +-\n builtin/rev-parse.c | 11 ++\n cache.h | 10 +-\n daemon.c | 11 +-\n environment.c | 24 ++-\n fast-import.c | 5 +-\n git-am.sh | 22 +--\n git-pull.sh | 2 +-\n git-rebase--interactive.sh | 6 +-\n git-rebase--merge.sh | 6 +-\n git-rebase.sh | 4 +-\n git-sh-setup.sh | 2 +-\n git-stash.sh | 6 +-\n path.c | 201 +++++++++++++++---------\n refs.c | 66 +++++---\n refs.h | 2 +-\n setup.c | 117 ++++++++++----\n strbuf.c | 8 +\n strbuf.h | 5 +\n submodule.c | 9 +-\n t/t0060-path-utils.sh | 34 +++++\n t/t1501-worktree.sh | 76 +++++++++\n t/t1510-repo-setup.sh | 1 +\n t/t2025-checkout-to.sh (new +x) | 48 ++++++\n templates/hooks--applypatch-msg.sample | 4 +-\n templates/hooks--pre-applypatch.sample | 4 +-\n trace.c | 1 +\n transport.c | 8 +-\n wrapper.c | 31 ++++\n 41 files changed, 976 insertions(+), 215 deletions(-)\n create mode 100755 t/t2025-checkout-to.sh\n\n-- \n1.8.5.2.240.g8478abd\n"},{"id":"234966","messageId":"1392730814-19656-2-git-send-email-pclouds@gmail.com","threadId":"35908","inReplyTo":"1392730814-19656-1-git-send-email-pclouds@gmail.com","subject":"[PATCH v3 01/25] path.c: make get_pathname() return strbuf instead of static buffer","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2014-02-18T13:39:50Z","receivedAt":"2014-02-18T13:39:50Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"We've been avoiding PATH_MAX whenever possible. This patch makes\nget_pathname() return a strbuf and updates the callers to take\nadvantage of this. The code is simplified as we no longer need to\nworry about buffer overflow.\n\nSigned-off-by: Nguyễn Thái Ngọc Duy \n---\n path.c | 119 +++++++++++++++++++++++++++--------------------------------------\n 1 file changed, 50 insertions(+), 69 deletions(-)\n\ndiff --git a/path.c b/path.c\nindex 24594c4..1a1b784 100644\n--- a/path.c\n+++ b/path.c\n@@ -16,11 +16,15 @@ static int get_st_mode_bits(const char *path, int *mode)\n \n static char bad_path[] = \"/bad-path/\";\n \n-static char *get_pathname(void)\n+static struct strbuf *get_pathname()\n {\n-\tstatic char pathname_array[4][PATH_MAX];\n+\tstatic struct strbuf pathname_array[4] = {\n+\t\tSTRBUF_INIT, STRBUF_INIT, STRBUF_INIT, STRBUF_INIT\n+\t};\n \tstatic int index;\n-\treturn pathname_array[3 & ++index];\n+\tstruct strbuf *sb = &pathname_array[3 & ++index];\n+\tstrbuf_reset(sb);\n+\treturn sb;\n }\n \n static char *cleanup_path(char *path)\n@@ -34,6 +38,13 @@ static char *cleanup_path(char *path)\n \treturn path;\n }\n \n+static void strbuf_cleanup_path(struct strbuf *sb)\n+{\n+\tchar *path = cleanup_path(sb->buf);\n+\tif (path > sb->buf)\n+\t\tstrbuf_remove(sb, 0, path - sb->buf);\n+}\n+\n char *mksnpath(char *buf, size_t n, const char *fmt, ...)\n {\n \tva_list args;\n@@ -49,85 +60,69 @@ char *mksnpath(char *buf, size_t n, const char *fmt, ...)\n \treturn cleanup_path(buf);\n }\n \n-static char *vsnpath(char *buf, size_t n, const char *fmt, va_list args)\n+static void vsnpath(struct strbuf *buf, const char *fmt, va_list args)\n {\n \tconst char *git_dir = get_git_dir();\n-\tsize_t len;\n-\n-\tlen = strlen(git_dir);\n-\tif (n < len + 1)\n-\t\tgoto bad;\n-\tmemcpy(buf, git_dir, len);\n-\tif (len && !is_dir_sep(git_dir[len-1]))\n-\t\tbuf[len++] = '/';\n-\tlen += vsnprintf(buf + len, n - len, fmt, args);\n-\tif (len >= n)\n-\t\tgoto bad;\n-\treturn cleanup_path(buf);\n-bad:\n-\tstrlcpy(buf, bad_path, n);\n-\treturn buf;\n+\tstrbuf_addstr(buf, git_dir);\n+\tif (buf->len && !is_dir_sep(buf->buf[buf->len - 1]))\n+\t\tstrbuf_addch(buf, '/');\n+\tstrbuf_vaddf(buf, fmt, args);\n+\tstrbuf_cleanup_path(buf);\n }\n \n char *git_snpath(char *buf, size_t n, const char *fmt, ...)\n {\n-\tchar *ret;\n+\tstruct strbuf *sb = get_pathname();\n \tva_list args;\n \tva_start(args, fmt);\n-\tret = vsnpath(buf, n, fmt, args);\n+\tvsnpath(sb, fmt, args);\n \tva_end(args);\n-\treturn ret;\n+\tif (sb->len >= n)\n+\t\tstrlcpy(buf, bad_path, n);\n+\telse\n+\t\tmemcpy(buf, sb->buf, sb->len + 1);\n+\treturn buf;\n }\n \n char *git_pathdup(const char *fmt, ...)\n {\n-\tchar path[PATH_MAX], *ret;\n+\tstruct strbuf *path = get_pathname();\n \tva_list args;\n \tva_start(args, fmt);\n-\tret = vsnpath(path, sizeof(path), fmt, args);\n+\tvsnpath(path, fmt, args);\n \tva_end(args);\n-\treturn xstrdup(ret);\n+\treturn strbuf_detach(path, NULL);\n }\n \n char *mkpathdup(const char *fmt, ...)\n {\n-\tchar *path;\n \tstruct strbuf sb = STRBUF_INIT;\n \tva_list args;\n-\n \tva_start(args, fmt);\n \tstrbuf_vaddf(&sb, fmt, args);\n \tva_end(args);\n-\tpath = xstrdup(cleanup_path(sb.buf));\n-\n-\tstrbuf_release(&sb);\n-\treturn path;\n+\tstrbuf_cleanup_path(&sb);\n+\treturn strbuf_detach(&sb, NULL);\n }\n \n char *mkpath(const char *fmt, ...)\n {\n \tva_list args;\n-\tunsigned len;\n-\tchar *pathname = get_pathname();\n-\n+\tstruct strbuf *pathname = get_pathname();\n \tva_start(args, fmt);\n-\tlen = vsnprintf(pathname, PATH_MAX, fmt, args);\n+\tstrbuf_vaddf(pathname, fmt, args);\n \tva_end(args);\n-\tif (len >= PATH_MAX)\n-\t\treturn bad_path;\n-\treturn cleanup_path(pathname);\n+\treturn cleanup_path(pathname->buf);\n }\n \n char *git_path(const char *fmt, ...)\n {\n-\tchar *pathname = get_pathname();\n+\tstruct strbuf *pathname = get_pathname();\n \tva_list args;\n-\tchar *ret;\n-\n \tva_start(args, fmt);\n-\tret = vsnpath(pathname, PATH_MAX, fmt, args);\n+\tvsnpath(pathname, fmt, args);\n \tva_end(args);\n-\treturn ret;\n+\treturn pathname->buf;\n }\n \n void home_config_paths(char **global, char **xdg, char *file)\n@@ -158,41 +153,27 @@ void home_config_paths(char **global, char **xdg, char *file)\n \n char *git_path_submodule(const char *path, const char *fmt, ...)\n {\n-\tchar *pathname = get_pathname();\n-\tstruct strbuf buf = STRBUF_INIT;\n+\tstruct strbuf *buf = get_pathname();\n \tconst char *git_dir;\n \tva_list args;\n-\tunsigned len;\n-\n-\tlen = strlen(path);\n-\tif (len > PATH_MAX-100)\n-\t\treturn bad_path;\n \n-\tstrbuf_addstr(&buf, path);\n-\tif (len && path[len-1] != '/')\n-\t\tstrbuf_addch(&buf, '/');\n-\tstrbuf_addstr(&buf, \".git\");\n+\tstrbuf_addstr(buf, path);\n+\tif (buf->len && buf->buf[buf->len - 1] != '/')\n+\t\tstrbuf_addch(buf, '/');\n+\tstrbuf_addstr(buf, \".git\");\n \n-\tgit_dir = read_gitfile(buf.buf);\n+\tgit_dir = read_gitfile(buf->buf);\n \tif (git_dir) {\n-\t\tstrbuf_reset(&buf);\n-\t\tstrbuf_addstr(&buf, git_dir);\n+\t\tstrbuf_reset(buf);\n+\t\tstrbuf_addstr(buf, git_dir);\n \t}\n-\tstrbuf_addch(&buf, '/');\n-\n-\tif (buf.len >= PATH_MAX)\n-\t\treturn bad_path;\n-\tmemcpy(pathname, buf.buf, buf.len + 1);\n-\n-\tstrbuf_release(&buf);\n-\tlen = strlen(pathname);\n+\tstrbuf_addch(buf, '/');\n \n \tva_start(args, fmt);\n-\tlen += vsnprintf(pathname + len, PATH_MAX - len, fmt, args);\n+\tstrbuf_vaddf(buf, fmt, args);\n \tva_end(args);\n-\tif (len >= PATH_MAX)\n-\t\treturn bad_path;\n-\treturn cleanup_path(pathname);\n+\tstrbuf_cleanup_path(buf);\n+\treturn buf->buf;\n }\n \n int validate_headref(const char *path)\n-- \n1.8.5.2.240.g8478abd\n"},{"id":"234968","messageId":"1392730814-19656-3-git-send-email-pclouds@gmail.com","threadId":"35908","inReplyTo":"1392730814-19656-1-git-send-email-pclouds@gmail.com","subject":"[PATCH v3 02/25] Convert git_snpath() to strbuf_git_path()","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2014-02-18T13:39:51Z","receivedAt":"2014-02-18T13:39:51Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"In the previous patch, git_snpath() is modified to take a strbuf\nbuffer from get_pathname() because vsnpath() needs that. But that\nmakes it awkward because git_snpath() receives a pre-allocated buffer\nfrom outside and has to copy data back.\n\nRename it to strbuf_git_path() and make it receive strbuf directly.\n\nSigned-off-by: Nguyễn Thái Ngọc Duy \n---\n builtin/checkout.c | 22 +++++++++---------\n cache.h | 4 ++--\n path.c | 8 +------\n refs.c | 66 +++++++++++++++++++++++++++++++++++-------------------\n refs.h | 2 +-\n 5 files changed, 57 insertions(+), 45 deletions(-)\n\ndiff --git a/builtin/checkout.c b/builtin/checkout.c\nindex 5df3837..0570e41 100644\n--- a/builtin/checkout.c\n+++ b/builtin/checkout.c\n@@ -585,18 +585,20 @@ static void update_refs_for_switch(const struct checkout_opts *opts,\n \t\tif (opts->new_orphan_branch) {\n \t\t\tif (opts->new_branch_log && !log_all_ref_updates) {\n \t\t\t\tint temp;\n-\t\t\t\tchar log_file[PATH_MAX];\n+\t\t\t\tstruct strbuf log_file = STRBUF_INIT;\n \t\t\t\tchar *ref_name = mkpath(\"refs/heads/%s\", opts->new_orphan_branch);\n+\t\t\t\tint ret;\n \n \t\t\t\ttemp = log_all_ref_updates;\n \t\t\t\tlog_all_ref_updates = 1;\n-\t\t\t\tif (log_ref_setup(ref_name, log_file, sizeof(log_file))) {\n+\t\t\t\tret = log_ref_setup(ref_name, &log_file);\n+\t\t\t\tlog_all_ref_updates = temp;\n+\t\t\t\tstrbuf_release(&log_file);\n+\t\t\t\tif (ret) {\n \t\t\t\t\tfprintf(stderr, _(\"Can not do reflog for '%s'\\n\"),\n \t\t\t\t\t opts->new_orphan_branch);\n-\t\t\t\t\tlog_all_ref_updates = temp;\n \t\t\t\t\treturn;\n \t\t\t\t}\n-\t\t\t\tlog_all_ref_updates = temp;\n \t\t\t}\n \t\t}\n \t\telse\n@@ -651,14 +653,10 @@ static void update_refs_for_switch(const struct checkout_opts *opts,\n \t\t\t\t\tnew->name);\n \t\t\t}\n \t\t}\n-\t\tif (old->path && old->name) {\n-\t\t\tchar log_file[PATH_MAX], ref_file[PATH_MAX];\n-\n-\t\t\tgit_snpath(log_file, sizeof(log_file), \"logs/%s\", old->path);\n-\t\t\tgit_snpath(ref_file, sizeof(ref_file), \"%s\", old->path);\n-\t\t\tif (!file_exists(ref_file) && file_exists(log_file))\n-\t\t\t\tremove_path(log_file);\n-\t\t}\n+\t\tif (old->path && old->name &&\n+\t\t !file_exists(git_path(\"%s\", old->path)) &&\n+\t\t file_exists(git_path(\"logs/%s\", old->path)))\n+\t\t\tremove_path(git_path(\"logs/%s\", old->path));\n \t}\n \tremove_branch_state();\n \tstrbuf_release(&msg);\ndiff --git a/cache.h b/cache.h\nindex dc040fb..8d3697e 100644\n--- a/cache.h\n+++ b/cache.h\n@@ -646,8 +646,8 @@ extern int check_repository_format(void);\n \n extern char *mksnpath(char *buf, size_t n, const char *fmt, ...)\n \t__attribute__((format (printf, 3, 4)));\n-extern char *git_snpath(char *buf, size_t n, const char *fmt, ...)\n-\t__attribute__((format (printf, 3, 4)));\n+extern void strbuf_git_path(struct strbuf *sb, const char *fmt, ...)\n+\t__attribute__((format (printf, 2, 3)));\n extern char *git_pathdup(const char *fmt, ...)\n \t__attribute__((format (printf, 1, 2)));\n extern char *mkpathdup(const char *fmt, ...)\ndiff --git a/path.c b/path.c\nindex 1a1b784..fe3f844 100644\n--- a/path.c\n+++ b/path.c\n@@ -70,18 +70,12 @@ static void vsnpath(struct strbuf *buf, const char *fmt, va_list args)\n \tstrbuf_cleanup_path(buf);\n }\n \n-char *git_snpath(char *buf, size_t n, const char *fmt, ...)\n+void strbuf_git_path(struct strbuf *sb, const char *fmt, ...)\n {\n-\tstruct strbuf *sb = get_pathname();\n \tva_list args;\n \tva_start(args, fmt);\n \tvsnpath(sb, fmt, args);\n \tva_end(args);\n-\tif (sb->len >= n)\n-\t\tstrlcpy(buf, bad_path, n);\n-\telse\n-\t\tmemcpy(buf, sb->buf, sb->len + 1);\n-\treturn buf;\n }\n \n char *git_pathdup(const char *fmt, ...)\ndiff --git a/refs.c b/refs.c\nindex 89228e2..434bd5e 100644\n--- a/refs.c\n+++ b/refs.c\n@@ -1325,10 +1325,12 @@ static const char *handle_missing_loose_ref(const char *refname,\n \n const char *resolve_ref_unsafe(const char *refname, unsigned char *sha1, int reading, int *flag)\n {\n+\tstruct strbuf sb_path = STRBUF_INIT;\n \tint depth = MAXDEPTH;\n \tssize_t len;\n \tchar buffer[256];\n \tstatic char refname_buffer[256];\n+\tconst char *ret;\n \n \tif (flag)\n \t\t*flag = 0;\n@@ -1337,15 +1339,17 @@ const char *resolve_ref_unsafe(const char *refname, unsigned char *sha1, int rea\n \t\treturn NULL;\n \n \tfor (;;) {\n-\t\tchar path[PATH_MAX];\n+\t\tconst char *path;\n \t\tstruct stat st;\n \t\tchar *buf;\n \t\tint fd;\n \n \t\tif (--depth < 0)\n-\t\t\treturn NULL;\n+\t\t\tgoto fail;\n \n-\t\tgit_snpath(path, sizeof(path), \"%s\", refname);\n+\t\tstrbuf_reset(&sb_path);\n+\t\tstrbuf_git_path(&sb_path, \"%s\", refname);\n+\t\tpath = sb_path.buf;\n \n \t\t/*\n \t\t * We might have to loop back here to avoid a race\n@@ -1359,10 +1363,11 @@ const char *resolve_ref_unsafe(const char *refname, unsigned char *sha1, int rea\n \tstat_ref:\n \t\tif (lstat(path, &st) < 0) {\n \t\t\tif (errno == ENOENT)\n-\t\t\t\treturn handle_missing_loose_ref(refname, sha1,\n-\t\t\t\t\t\t\t\treading, flag);\n+\t\t\t\tret = handle_missing_loose_ref(refname, sha1,\n+\t\t\t\t\t\t\t reading, flag);\n \t\t\telse\n-\t\t\t\treturn NULL;\n+\t\t\t\tret = NULL;\n+\t\t\tgoto done;\n \t\t}\n \n \t\t/* Follow \"normalized\" - ie \"refs/..\" symlinks by hand */\n@@ -1373,7 +1378,7 @@ const char *resolve_ref_unsafe(const char *refname, unsigned char *sha1, int rea\n \t\t\t\t\t/* inconsistent with lstat; retry */\n \t\t\t\t\tgoto stat_ref;\n \t\t\t\telse\n-\t\t\t\t\treturn NULL;\n+\t\t\t\t\tgoto fail;\n \t\t\t}\n \t\t\tbuffer[len] = 0;\n \t\t\tif (starts_with(buffer, \"refs/\") &&\n@@ -1389,7 +1394,7 @@ const char *resolve_ref_unsafe(const char *refname, unsigned char *sha1, int rea\n \t\t/* Is it a directory? */\n \t\tif (S_ISDIR(st.st_mode)) {\n \t\t\terrno = EISDIR;\n-\t\t\treturn NULL;\n+\t\t\tgoto fail;\n \t\t}\n \n \t\t/*\n@@ -1402,12 +1407,13 @@ const char *resolve_ref_unsafe(const char *refname, unsigned char *sha1, int rea\n \t\t\t\t/* inconsistent with lstat; retry */\n \t\t\t\tgoto stat_ref;\n \t\t\telse\n-\t\t\t\treturn NULL;\n+\t\t\t\tgoto fail;\n \t\t}\n+\n \t\tlen = read_in_full(fd, buffer, sizeof(buffer)-1);\n \t\tclose(fd);\n \t\tif (len < 0)\n-\t\t\treturn NULL;\n+\t\t\tgoto fail;\n \t\twhile (len && isspace(buffer[len-1]))\n \t\t\tlen--;\n \t\tbuffer[len] = '\\0';\n@@ -1424,9 +1430,10 @@ const char *resolve_ref_unsafe(const char *refname, unsigned char *sha1, int rea\n \t\t\t (buffer[40] != '\\0' && !isspace(buffer[40]))) {\n \t\t\t\tif (flag)\n \t\t\t\t\t*flag |= REF_ISBROKEN;\n-\t\t\t\treturn NULL;\n+\t\t\t\tgoto fail;\n \t\t\t}\n-\t\t\treturn refname;\n+\t\t\tret = refname;\n+\t\t\tgoto done;\n \t\t}\n \t\tif (flag)\n \t\t\t*flag |= REF_ISSYMREF;\n@@ -1436,10 +1443,15 @@ const char *resolve_ref_unsafe(const char *refname, unsigned char *sha1, int rea\n \t\tif (check_refname_format(buf, REFNAME_ALLOW_ONELEVEL)) {\n \t\t\tif (flag)\n \t\t\t\t*flag |= REF_ISBROKEN;\n-\t\t\treturn NULL;\n+\t\t\tgoto fail;\n \t\t}\n \t\trefname = strcpy(refname_buffer, buf);\n \t}\n+fail:\n+\tret = NULL;\n+done:\n+\tstrbuf_release(&sb_path);\n+\treturn ret;\n }\n \n char *resolve_refdup(const char *ref, unsigned char *sha1, int reading, int *flag)\n@@ -2717,17 +2729,19 @@ static int copy_msg(char *buf, const char *msg)\n \treturn cp - buf;\n }\n \n-int log_ref_setup(const char *refname, char *logfile, int bufsize)\n+int log_ref_setup(const char *refname, struct strbuf *sb_logfile)\n {\n \tint logfd, oflags = O_APPEND | O_WRONLY;\n+\tconst char *logfile;\n \n-\tgit_snpath(logfile, bufsize, \"logs/%s\", refname);\n+\tstrbuf_git_path(sb_logfile, \"logs/%s\", refname);\n+\tlogfile = sb_logfile->buf;\n \tif (log_all_ref_updates &&\n \t (starts_with(refname, \"refs/heads/\") ||\n \t starts_with(refname, \"refs/remotes/\") ||\n \t starts_with(refname, \"refs/notes/\") ||\n \t !strcmp(refname, \"HEAD\"))) {\n-\t\tif (safe_create_leading_directories(logfile) < 0)\n+\t\tif (safe_create_leading_directories(sb_logfile->buf) < 0)\n \t\t\treturn error(\"unable to create directory for %s\",\n \t\t\t\t logfile);\n \t\toflags |= O_CREAT;\n@@ -2762,20 +2776,22 @@ static int log_ref_write(const char *refname, const unsigned char *old_sha1,\n \tint logfd, result, written, oflags = O_APPEND | O_WRONLY;\n \tunsigned maxlen, len;\n \tint msglen;\n-\tchar log_file[PATH_MAX];\n+\tstruct strbuf sb_log_file = STRBUF_INIT;\n+\tconst char *log_file;\n \tchar *logrec;\n \tconst char *committer;\n \n \tif (log_all_ref_updates < 0)\n \t\tlog_all_ref_updates = !is_bare_repository();\n \n-\tresult = log_ref_setup(refname, log_file, sizeof(log_file));\n+\tresult = log_ref_setup(refname, &sb_log_file);\n \tif (result)\n-\t\treturn result;\n+\t\tgoto done;\n+\tlog_file = sb_log_file.buf;\n \n \tlogfd = open(log_file, oflags);\n \tif (logfd < 0)\n-\t\treturn 0;\n+\t\tgoto done;\n \tmsglen = msg ? strlen(msg) : 0;\n \tcommitter = git_committer_info(0);\n \tmaxlen = strlen(committer) + msglen + 100;\n@@ -2788,9 +2804,13 @@ static int log_ref_write(const char *refname, const unsigned char *old_sha1,\n \t\tlen += copy_msg(logrec + len - 1, msg) - 1;\n \twritten = len <= maxlen ? write_in_full(logfd, logrec, len) : -1;\n \tfree(logrec);\n-\tif (close(logfd) != 0 || written != len)\n-\t\treturn error(\"Unable to append to %s\", log_file);\n-\treturn 0;\n+\tif (close(logfd) != 0 || written != len) {\n+\t\terror(\"Unable to append to %s\", log_file);\n+\t\tresult = -1;\n+\t}\n+done:\n+\tstrbuf_release(&sb_log_file);\n+\treturn result;\n }\n \n static int is_branch(const char *refname)\ndiff --git a/refs.h b/refs.h\nindex 87a1a79..783033a 100644\n--- a/refs.h\n+++ b/refs.h\n@@ -166,7 +166,7 @@ extern void unlock_ref(struct ref_lock *lock);\n extern int write_ref_sha1(struct ref_lock *lock, const unsigned char *sha1, const char *msg);\n \n /** Setup reflog before using. **/\n-int log_ref_setup(const char *ref_name, char *logfile, int bufsize);\n+int log_ref_setup(const char *ref_name, struct strbuf *logfile);\n \n /** Reads log for the value of ref during at_time. **/\n extern int read_ref_at(const char *refname, unsigned long at_time, int cnt,\n-- \n1.8.5.2.240.g8478abd\n"},{"id":"234967","messageId":"1392730814-19656-4-git-send-email-pclouds@gmail.com","threadId":"35908","inReplyTo":"1392730814-19656-1-git-send-email-pclouds@gmail.com","subject":"[PATCH v3 03/25] path.c: rename vsnpath() to do_git_path()","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2014-02-18T13:39:52Z","receivedAt":"2014-02-18T13:39:52Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"The name vsnpath() gives an impression that this is general path\nhandling function. It's not. This is the underlying implementation of\ngit_path(), git_pathdup() and strbuf_git_path() which will prefix\n$GIT_DIR in the result string.\n\nSigned-off-by: Nguyễn Thái Ngọc Duy \n---\n path.c | 8 ++++----\n 1 file changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/path.c b/path.c\nindex fe3f844..635ec41 100644\n--- a/path.c\n+++ b/path.c\n@@ -60,7 +60,7 @@ char *mksnpath(char *buf, size_t n, const char *fmt, ...)\n \treturn cleanup_path(buf);\n }\n \n-static void vsnpath(struct strbuf *buf, const char *fmt, va_list args)\n+static void do_git_path(struct strbuf *buf, const char *fmt, va_list args)\n {\n \tconst char *git_dir = get_git_dir();\n \tstrbuf_addstr(buf, git_dir);\n@@ -74,7 +74,7 @@ void strbuf_git_path(struct strbuf *sb, const char *fmt, ...)\n {\n \tva_list args;\n \tva_start(args, fmt);\n-\tvsnpath(sb, fmt, args);\n+\tdo_git_path(sb, fmt, args);\n \tva_end(args);\n }\n \n@@ -83,7 +83,7 @@ char *git_pathdup(const char *fmt, ...)\n \tstruct strbuf *path = get_pathname();\n \tva_list args;\n \tva_start(args, fmt);\n-\tvsnpath(path, fmt, args);\n+\tdo_git_path(path, fmt, args);\n \tva_end(args);\n \treturn strbuf_detach(path, NULL);\n }\n@@ -114,7 +114,7 @@ char *git_path(const char *fmt, ...)\n \tstruct strbuf *pathname = get_pathname();\n \tva_list args;\n \tva_start(args, fmt);\n-\tvsnpath(pathname, fmt, args);\n+\tdo_git_path(pathname, fmt, args);\n \tva_end(args);\n \treturn pathname->buf;\n }\n-- \n1.8.5.2.240.g8478abd\n"},{"id":"234969","messageId":"1392730814-19656-5-git-send-email-pclouds@gmail.com","threadId":"35908","inReplyTo":"1392730814-19656-1-git-send-email-pclouds@gmail.com","subject":"[PATCH v3 04/25] path.c: group git_path(), git_pathdup() and strbuf_git_path() together","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2014-02-18T13:39:53Z","receivedAt":"2014-02-18T13:39:53Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"Signed-off-by: Nguyễn Thái Ngọc Duy \n---\n path.c | 20 ++++++++++----------\n 1 file changed, 10 insertions(+), 10 deletions(-)\n\ndiff --git a/path.c b/path.c\nindex 635ec41..e088c40 100644\n--- a/path.c\n+++ b/path.c\n@@ -78,6 +78,16 @@ void strbuf_git_path(struct strbuf *sb, const char *fmt, ...)\n \tva_end(args);\n }\n \n+char *git_path(const char *fmt, ...)\n+{\n+\tstruct strbuf *pathname = get_pathname();\n+\tva_list args;\n+\tva_start(args, fmt);\n+\tdo_git_path(pathname, fmt, args);\n+\tva_end(args);\n+\treturn pathname->buf;\n+}\n+\n char *git_pathdup(const char *fmt, ...)\n {\n \tstruct strbuf *path = get_pathname();\n@@ -109,16 +119,6 @@ char *mkpath(const char *fmt, ...)\n \treturn cleanup_path(pathname->buf);\n }\n \n-char *git_path(const char *fmt, ...)\n-{\n-\tstruct strbuf *pathname = get_pathname();\n-\tva_list args;\n-\tva_start(args, fmt);\n-\tdo_git_path(pathname, fmt, args);\n-\tva_end(args);\n-\treturn pathname->buf;\n-}\n-\n void home_config_paths(char **global, char **xdg, char *file)\n {\n \tchar *xdg_home = getenv(\"XDG_CONFIG_HOME\");\n-- \n1.8.5.2.240.g8478abd\n"},{"id":"234970","messageId":"1392730814-19656-6-git-send-email-pclouds@gmail.com","threadId":"35908","inReplyTo":"1392730814-19656-1-git-send-email-pclouds@gmail.com","subject":"[PATCH v3 05/25] Make git_path() aware of file relocation in $GIT_DIR","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2014-02-18T13:39:54Z","receivedAt":"2014-02-18T13:39:54Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"We allow the user to relocate certain paths out of $GIT_DIR via\nenvironment variables, e.g. GIT_OBJECT_DIRECTORY, GIT_INDEX_FILE and\nGIT_GRAFT_FILE. All callers are not supposed to use git_path() or\ngit_pathdup() to get those paths. Instead they must use\nget_object_directory(), get_index_file() and get_graft_file()\nrespectively. This is inconvenient and could be missed in review\n(there's git_path(\"objects/info/alternates\") somewhere in\nsha1_file.c).\n\nThis patch makes git_path() and git_pathdup() understand those\nenvironment variables. So if you set GIT_OBJECT_DIRECTORY to /foo/bar,\ngit_path(\"objects/abc\") should return /tmp/bar/abc. The same is done\nfor the two remaining env variables.\n\n\"git rev-parse --git-path\" is the wrapper for script use.\n\nSigned-off-by: Nguyễn Thái Ngọc Duy \n---\n Documentation/git-rev-parse.txt | 5 +++++\n builtin/rev-parse.c | 7 +++++++\n cache.h | 1 +\n environment.c | 9 ++++++--\n path.c | 46 +++++++++++++++++++++++++++++++++++++++++\n t/t0060-path-utils.sh | 19 +++++++++++++++++\n 6 files changed, 85 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt\nindex 0d2cdcd..33e4e90 100644\n--- a/Documentation/git-rev-parse.txt\n+++ b/Documentation/git-rev-parse.txt\n@@ -232,6 +232,11 @@ print a message to stderr and exit with nonzero status.\n \trepository. If is a gitfile then the resolved path\n \tto the real repository is printed.\n \n+--git-path ::\n+\tResolve \"$GIT_DIR/\" and takes other path relocation\n+\tvariables such as $GIT_OBJECT_DIRECTORY,\n+\t$GIT_INDEX_FILE... into account.\n+\n --show-cdup::\n \tWhen the command is invoked from a subdirectory, show the\n \tpath of the top-level directory relative to the current\ndiff --git a/builtin/rev-parse.c b/builtin/rev-parse.c\nindex aaeb611..e50bc65 100644\n--- a/builtin/rev-parse.c\n+++ b/builtin/rev-parse.c\n@@ -518,6 +518,13 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)\n \tfor (i = 1; i < argc; i++) {\n \t\tconst char *arg = argv[i];\n \n+\t\tif (!strcmp(arg, \"--git-path\")) {\n+\t\t\tif (!argv[i + 1])\n+\t\t\t\tdie(\"--git-path requires an argument\");\n+\t\t\tputs(git_path(\"%s\", argv[i + 1]));\n+\t\t\ti++;\n+\t\t\tcontinue;\n+\t\t}\n \t\tif (as_is) {\n \t\t\tif (show_file(arg, output_prefix) && as_is < 2)\n \t\t\t\tverify_filename(prefix, arg, 0);\ndiff --git a/cache.h b/cache.h\nindex 8d3697e..6c08e4a 100644\n--- a/cache.h\n+++ b/cache.h\n@@ -585,6 +585,7 @@ extern int fsync_object_files;\n extern int core_preload_index;\n extern int core_apply_sparse_checkout;\n extern int precomposed_unicode;\n+extern int git_db_env, git_index_env, git_graft_env;\n \n /*\n * The character that begins a commented line in user-editable file\ndiff --git a/environment.c b/environment.c\nindex 4a3437d..f513479 100644\n--- a/environment.c\n+++ b/environment.c\n@@ -82,6 +82,7 @@ static size_t namespace_len;\n \n static const char *git_dir;\n static char *git_object_dir, *git_index_file, *git_graft_file;\n+int git_db_env, git_index_env, git_graft_env;\n \n /*\n * Repository-local GIT_* environment variables; see cache.h for details.\n@@ -137,15 +138,19 @@ static void setup_git_env(void)\n \tif (!git_object_dir) {\n \t\tgit_object_dir = xmalloc(strlen(git_dir) + 9);\n \t\tsprintf(git_object_dir, \"%s/objects\", git_dir);\n-\t}\n+\t} else\n+\t\tgit_db_env = 1;\n \tgit_index_file = getenv(INDEX_ENVIRONMENT);\n \tif (!git_index_file) {\n \t\tgit_index_file = xmalloc(strlen(git_dir) + 7);\n \t\tsprintf(git_index_file, \"%s/index\", git_dir);\n-\t}\n+\t} else\n+\t\tgit_index_env = 1;\n \tgit_graft_file = getenv(GRAFT_ENVIRONMENT);\n \tif (!git_graft_file)\n \t\tgit_graft_file = git_pathdup(\"info/grafts\");\n+\telse\n+\t\tgit_graft_env = 1;\n \tif (getenv(NO_REPLACE_OBJECTS_ENVIRONMENT))\n \t\tread_replace_refs = 0;\n \tnamespace = expand_namespace(getenv(GIT_NAMESPACE_ENVIRONMENT));\ndiff --git a/path.c b/path.c\nindex e088c40..0f8c3dc 100644\n--- a/path.c\n+++ b/path.c\n@@ -60,13 +60,59 @@ char *mksnpath(char *buf, size_t n, const char *fmt, ...)\n \treturn cleanup_path(buf);\n }\n \n+static int dir_prefix(const char *buf, const char *dir)\n+{\n+\tint len = strlen(dir);\n+\treturn !strncmp(buf, dir, len) &&\n+\t\t(is_dir_sep(buf[len]) || buf[len] == '\\0');\n+}\n+\n+/* $buf =~ m|$dir/+$file| but without regex */\n+static int is_dir_file(const char *buf, const char *dir, const char *file)\n+{\n+\tint len = strlen(dir);\n+\tif (strncmp(buf, dir, len) || !is_dir_sep(buf[len]))\n+\t\treturn 0;\n+\twhile (is_dir_sep(buf[len]))\n+\t\tlen++;\n+\treturn !strcmp(buf + len, file);\n+}\n+\n+static void replace_dir(struct strbuf *buf, int len, const char *newdir)\n+{\n+\tint newlen = strlen(newdir);\n+\tint need_sep = (buf->buf[len] && !is_dir_sep(buf->buf[len])) &&\n+\t\t!is_dir_sep(newdir[newlen - 1]);\n+\tif (need_sep)\n+\t\tlen--;\t /* keep one char, to be replaced with '/' */\n+\tstrbuf_splice(buf, 0, len, newdir, newlen);\n+\tif (need_sep)\n+\t\tbuf->buf[newlen] = '/';\n+}\n+\n+static void adjust_git_path(struct strbuf *buf, int git_dir_len)\n+{\n+\tconst char *base = buf->buf + git_dir_len;\n+\tif (git_graft_env && is_dir_file(base, \"info\", \"grafts\"))\n+\t\tstrbuf_splice(buf, 0, buf->len,\n+\t\t\t get_graft_file(), strlen(get_graft_file()));\n+\telse if (git_index_env && !strcmp(base, \"index\"))\n+\t\tstrbuf_splice(buf, 0, buf->len,\n+\t\t\t get_index_file(), strlen(get_index_file()));\n+\telse if (git_db_env && dir_prefix(base, \"objects\"))\n+\t\treplace_dir(buf, git_dir_len + 7, get_object_directory());\n+}\n+\n static void do_git_path(struct strbuf *buf, const char *fmt, va_list args)\n {\n \tconst char *git_dir = get_git_dir();\n+\tint gitdir_len;\n \tstrbuf_addstr(buf, git_dir);\n \tif (buf->len && !is_dir_sep(buf->buf[buf->len - 1]))\n \t\tstrbuf_addch(buf, '/');\n+\tgitdir_len = buf->len;\n \tstrbuf_vaddf(buf, fmt, args);\n+\tadjust_git_path(buf, gitdir_len);\n \tstrbuf_cleanup_path(buf);\n }\n \ndiff --git a/t/t0060-path-utils.sh b/t/t0060-path-utils.sh\nindex 07c10c8..1d29901 100755\n--- a/t/t0060-path-utils.sh\n+++ b/t/t0060-path-utils.sh\n@@ -19,6 +19,14 @@ relative_path() {\n \t\"test \\\"\\$(test-path-utils relative_path '$1' '$2')\\\" = '$expected'\"\n }\n \n+test_git_path() {\n+\ttest_expect_success \"git-path $1 $2 => $3\" \"\n+\t\t$1 git rev-parse --git-path $2 >actual &&\n+\t\techo $3 >expect &&\n+\t\ttest_cmp expect actual\n+\t\"\n+}\n+\n # On Windows, we are using MSYS's bash, which mangles the paths.\n # Absolute paths are anchored at the MSYS installation directory,\n # which means that the path / accounts for this many characters:\n@@ -223,4 +231,15 @@ relative_path \"\"\t\t\"\"\t./\n relative_path \"\"\t\t\"\"\t./\n relative_path \"\"\t\t/foo/a/b\t./\n \n+test_git_path A=B info/grafts .git/info/grafts\n+test_git_path GIT_GRAFT_FILE=foo info/grafts foo\n+test_git_path GIT_GRAFT_FILE=foo info/////grafts foo\n+test_git_path GIT_INDEX_FILE=foo index foo\n+test_git_path GIT_INDEX_FILE=foo index/foo .git/index/foo\n+test_git_path GIT_INDEX_FILE=foo index2 .git/index2\n+test_expect_success 'setup fake objects directory foo' 'mkdir foo'\n+test_git_path GIT_OBJECT_DIRECTORY=foo objects foo\n+test_git_path GIT_OBJECT_DIRECTORY=foo objects/foo foo/foo\n+test_git_path GIT_OBJECT_DIRECTORY=foo objects2 .git/objects2\n+\n test_done\n-- \n1.8.5.2.240.g8478abd\n"},{"id":"234982","messageId":"1392730814-19656-7-git-send-email-pclouds@gmail.com","threadId":"35908","inReplyTo":"1392730814-19656-1-git-send-email-pclouds@gmail.com","subject":"[PATCH v3 06/25] *.sh: respect $GIT_INDEX_FILE","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2014-02-18T13:39:55Z","receivedAt":"2014-02-18T13:39:55Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"Signed-off-by: Nguyễn Thái Ngọc Duy \n---\n git-pull.sh | 2 +-\n git-stash.sh | 2 +-\n 2 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/git-pull.sh b/git-pull.sh\nindex 0a5aa2c..c9dc9ba 100755\n--- a/git-pull.sh\n+++ b/git-pull.sh\n@@ -218,7 +218,7 @@ test true = \"$rebase\" && {\n \tif ! git rev-parse -q --verify HEAD >/dev/null\n \tthen\n \t\t# On an unborn branch\n-\t\tif test -f \"$GIT_DIR/index\"\n+\t\tif test -f \"`git rev-parse --git-path index`\"\n \t\tthen\n \t\t\tdie \"$(gettext \"updating an unborn branch with changes added to the index\")\"\n \t\tfi\ndiff --git a/git-stash.sh b/git-stash.sh\nindex f0a94ab..ae7d16e 100755\n--- a/git-stash.sh\n+++ b/git-stash.sh\n@@ -20,7 +20,7 @@ require_work_tree\n cd_to_toplevel\n \n TMP=\"$GIT_DIR/.git-stash.$$\"\n-TMPindex=${GIT_INDEX_FILE-\"$GIT_DIR/index\"}.stash.$$\n+TMPindex=${GIT_INDEX_FILE-\"`git rev-parse --git-path index`\"}.stash.$$\n trap 'rm -f \"$TMP-\"* \"$TMPindex\"' 0\n \n ref_stash=refs/stash\n-- \n1.8.5.2.240.g8478abd\n"},{"id":"234973","messageId":"1392730814-19656-8-git-send-email-pclouds@gmail.com","threadId":"35908","inReplyTo":"1392730814-19656-1-git-send-email-pclouds@gmail.com","subject":"[PATCH v3 07/25] reflog: avoid constructing .lock path with git_path","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2014-02-18T13:39:56Z","receivedAt":"2014-02-18T13:39:56Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"git_path() soon understands the path given to it. Some paths \"abc\" may\nbecome \"def\" while other \"ghi\" may become \"ijk\". We don't want\ngit_path() to interfere with .lock path construction. Concatenate\n\".lock\" after the path has been resolved by git_path() so if \"abc\"\nbecomes \"def\", we'll have \"def.lock\", not \"ijk\".\n\nSigned-off-by: Nguyễn Thái Ngọc Duy \n---\n builtin/reflog.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/builtin/reflog.c b/builtin/reflog.c\nindex 852cff6..ccf2cf6 100644\n--- a/builtin/reflog.c\n+++ b/builtin/reflog.c\n@@ -372,7 +372,7 @@ static int expire_reflog(const char *ref, const unsigned char *sha1, int unused,\n \tif (!file_exists(log_file))\n \t\tgoto finish;\n \tif (!cmd->dry_run) {\n-\t\tnewlog_path = git_pathdup(\"logs/%s.lock\", ref);\n+\t\tnewlog_path = mkpathdup(\"%s.lock\", log_file);\n \t\tcb.newlog = fopen(newlog_path, \"w\");\n \t}\n \n-- \n1.8.5.2.240.g8478abd\n"},{"id":"234972","messageId":"1392730814-19656-9-git-send-email-pclouds@gmail.com","threadId":"35908","inReplyTo":"1392730814-19656-1-git-send-email-pclouds@gmail.com","subject":"[PATCH v3 08/25] fast-import: use git_path() for accessing .git dir instead of get_git_dir()","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2014-02-18T13:39:57Z","receivedAt":"2014-02-18T13:39:57Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"This allows git_path() to redirect info/fast-import to another place\nif needed\n\nSigned-off-by: Nguyễn Thái Ngọc Duy \n---\n fast-import.c | 5 +----\n 1 file changed, 1 insertion(+), 4 deletions(-)\n\ndiff --git a/fast-import.c b/fast-import.c\nindex 4fd18a3..08a1e78 100644\n--- a/fast-import.c\n+++ b/fast-import.c\n@@ -3125,12 +3125,9 @@ static void parse_progress(void)\n \n static char* make_fast_import_path(const char *path)\n {\n-\tstruct strbuf abs_path = STRBUF_INIT;\n-\n \tif (!relative_marks_paths || is_absolute_path(path))\n \t\treturn xstrdup(path);\n-\tstrbuf_addf(&abs_path, \"%s/info/fast-import/%s\", get_git_dir(), path);\n-\treturn strbuf_detach(&abs_path, NULL);\n+\treturn xstrdup(git_path(\"info/fast-import/%s\", path));\n }\n \n static void option_import_marks(const char *marks,\n-- \n1.8.5.2.240.g8478abd\n"},{"id":"234971","messageId":"1392730814-19656-10-git-send-email-pclouds@gmail.com","threadId":"35908","inReplyTo":"1392730814-19656-1-git-send-email-pclouds@gmail.com","subject":"[PATCH v3 09/25] commit: use SEQ_DIR instead of hardcoding \"sequencer\"","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2014-02-18T13:39:58Z","receivedAt":"2014-02-18T13:39:58Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"Signed-off-by: Nguyễn Thái Ngọc Duy \n---\n builtin/commit.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/builtin/commit.c b/builtin/commit.c\nindex 3767478..ee3ac10 100644\n--- a/builtin/commit.c\n+++ b/builtin/commit.c\n@@ -155,7 +155,7 @@ static void determine_whence(struct wt_status *s)\n \t\twhence = FROM_MERGE;\n \telse if (file_exists(git_path(\"CHERRY_PICK_HEAD\"))) {\n \t\twhence = FROM_CHERRY_PICK;\n-\t\tif (file_exists(git_path(\"sequencer\")))\n+\t\tif (file_exists(git_path(SEQ_DIR)))\n \t\t\tsequencer_in_use = 1;\n \t}\n \telse\n-- \n1.8.5.2.240.g8478abd\n"},{"id":"234975","messageId":"1392730814-19656-11-git-send-email-pclouds@gmail.com","threadId":"35908","inReplyTo":"1392730814-19656-1-git-send-email-pclouds@gmail.com","subject":"[PATCH v3 10/25] Add new environment variable $GIT_COMMON_DIR","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2014-02-18T13:39:59Z","receivedAt":"2014-02-18T13:39:59Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"This variable is intended to support multiple working directories\nattached to a repository. Such a repository may have a main working\ndirectory, created by either \"git init\" or \"git clone\" and one or more\nlinked working directories. These working directories and the main\nrepository share the same repository directory.\n\nIn linked working directories, $GIT_COMMON_DIR must be defined to point\nto the real repository directory and $GIT_DIR points to an unused\nsubdirectory inside $GIT_COMMON_DIR. File locations inside the\nrepository are reorganized from the linked worktree view point:\n\n - worktree-specific such as HEAD, logs/HEAD, index, other top-level\n refs and unrecognized files are from $GIT_DIR.\n\n - the rest like objects, refs, info, hooks, packed-refs, shallow...\n are from $GIT_COMMON_DIR\n\nScripts are supposed to retrieve paths in $GIT_DIR with \"git rev-parse\n--git-path\", which will take care of \"$GIT_DIR vs $GIT_COMMON_DIR\"\nbusiness.\n\nNote that logs/refs/.tmp-renamed-log is used to prepare new reflog\nentry and it's supposed to be on the same filesystem as the target\nreflog file. This is not guaranteed true for logs/HEAD when it's\nmapped to repos/xx/logs/HEAD because the user can put \"repos\"\ndirectory on different filesystem. Don't mess with .git unless you\nknow what you're doing.\n\nThe redirection is done by git_path(), git_pathdup() and\nstrbuf_git_path(). The selected list of paths goes to $GIT_COMMON_DIR,\nnot the other way around in case a developer adds a new\nworktree-specific file and it's accidentally promoted to be shared\nacross repositories (this includes unknown files added by third party\ncommands)\n\nThe list of known files that belong to $GIT_DIR are:\n\nADD_EDIT.patch BISECT_ANCESTORS_OK BISECT_EXPECTED_REV BISECT_LOG\nBISECT_NAMES CHERRY_PICK_HEAD COMMIT_MSG FETCH_HEAD HEAD MERGE_HEAD\nMERGE_MODE MERGE_RR NOTES_EDITMSG NOTES_MERGE_WORKTREE ORIG_HEAD\nREVERT_HEAD SQUASH_MSG TAG_EDITMSG fast_import_crash_* logs/HEAD\nnext-index-* rebase-apply rebase-merge rsync-refs-* sequencer/*\nshallow_*\n\nPath mapping is NOT done for git_path_submodule(). Multi-checkouts are\nnot supported as submodules.\n\nSigned-off-by: Nguyễn Thái Ngọc Duy \n---\n Documentation/git.txt | 8 ++++++++\n cache.h | 4 +++-\n environment.c | 19 +++++++++++++++----\n path.c | 28 ++++++++++++++++++++++++++++\n t/t0060-path-utils.sh | 15 +++++++++++++++\n 5 files changed, 69 insertions(+), 5 deletions(-)\n\ndiff --git a/Documentation/git.txt b/Documentation/git.txt\nindex 02bbc08..2c4a055 100644\n--- a/Documentation/git.txt\n+++ b/Documentation/git.txt\n@@ -773,6 +773,14 @@ Git so take care if using Cogito etc.\n \tan explicit repository directory set via 'GIT_DIR' or on the\n \tcommand line.\n \n+'GIT_COMMON_DIR'::\n+\tIf this variable is set to a path, non-worktree files that are\n+\tnormally in $GIT_DIR will be taken from this path\n+\tinstead. Worktree-specific files such as HEAD or index are\n+\ttaken from $GIT_DIR. This variable has lower precedence than\n+\tother path variables such as GIT_INDEX_FILE,\n+\tGIT_OBJECT_DIRECTORY...\n+\n Git Commits\n ~~~~~~~~~~~\n 'GIT_AUTHOR_NAME'::\ndiff --git a/cache.h b/cache.h\nindex 6c08e4a..51ade32 100644\n--- a/cache.h\n+++ b/cache.h\n@@ -347,6 +347,7 @@ static inline enum object_type object_type(unsigned int mode)\n \n /* Double-check local_repo_env below if you add to this list. */\n #define GIT_DIR_ENVIRONMENT \"GIT_DIR\"\n+#define GIT_COMMON_DIR_ENVIRONMENT \"GIT_COMMON_DIR\"\n #define GIT_NAMESPACE_ENVIRONMENT \"GIT_NAMESPACE\"\n #define GIT_WORK_TREE_ENVIRONMENT \"GIT_WORK_TREE\"\n #define GIT_PREFIX_ENVIRONMENT \"GIT_PREFIX\"\n@@ -400,6 +401,7 @@ extern int is_inside_git_dir(void);\n extern char *git_work_tree_cfg;\n extern int is_inside_work_tree(void);\n extern const char *get_git_dir(void);\n+extern const char *get_git_common_dir(void);\n extern int is_git_directory(const char *path);\n extern char *get_object_directory(void);\n extern char *get_index_file(void);\n@@ -585,7 +587,7 @@ extern int fsync_object_files;\n extern int core_preload_index;\n extern int core_apply_sparse_checkout;\n extern int precomposed_unicode;\n-extern int git_db_env, git_index_env, git_graft_env;\n+extern int git_db_env, git_index_env, git_graft_env, git_common_dir_env;\n \n /*\n * The character that begins a commented line in user-editable file\ndiff --git a/environment.c b/environment.c\nindex f513479..c998120 100644\n--- a/environment.c\n+++ b/environment.c\n@@ -80,9 +80,9 @@ static char *work_tree;\n static const char *namespace;\n static size_t namespace_len;\n \n-static const char *git_dir;\n+static const char *git_dir, *git_common_dir;\n static char *git_object_dir, *git_index_file, *git_graft_file;\n-int git_db_env, git_index_env, git_graft_env;\n+int git_db_env, git_index_env, git_graft_env, git_common_dir_env;\n \n /*\n * Repository-local GIT_* environment variables; see cache.h for details.\n@@ -134,10 +134,16 @@ static void setup_git_env(void)\n \t\tgit_dir = DEFAULT_GIT_DIR_ENVIRONMENT;\n \tgitfile = read_gitfile(git_dir);\n \tgit_dir = xstrdup(gitfile ? gitfile : git_dir);\n+\tgit_common_dir = getenv(GIT_COMMON_DIR_ENVIRONMENT);\n+\tif (git_common_dir) {\n+\t\tgit_common_dir_env = 1;\n+\t\tgit_common_dir = xstrdup(git_common_dir);\n+\t} else\n+\t\tgit_common_dir = git_dir;\n \tgit_object_dir = getenv(DB_ENVIRONMENT);\n \tif (!git_object_dir) {\n-\t\tgit_object_dir = xmalloc(strlen(git_dir) + 9);\n-\t\tsprintf(git_object_dir, \"%s/objects\", git_dir);\n+\t\tgit_object_dir = xmalloc(strlen(git_common_dir) + 9);\n+\t\tsprintf(git_object_dir, \"%s/objects\", git_common_dir);\n \t} else\n \t\tgit_db_env = 1;\n \tgit_index_file = getenv(INDEX_ENVIRONMENT);\n@@ -173,6 +179,11 @@ const char *get_git_dir(void)\n \treturn git_dir;\n }\n \n+const char *get_git_common_dir(void)\n+{\n+\treturn git_common_dir;\n+}\n+\n const char *get_git_namespace(void)\n {\n \tif (!namespace)\ndiff --git a/path.c b/path.c\nindex 0f8c3dc..2d757dc 100644\n--- a/path.c\n+++ b/path.c\n@@ -90,6 +90,32 @@ static void replace_dir(struct strbuf *buf, int len, const char *newdir)\n \t\tbuf->buf[newlen] = '/';\n }\n \n+static void update_common_dir(struct strbuf *buf, int git_dir_len)\n+{\n+\tconst char *common_dir_list[] = {\n+\t\t\"branches\", \"hooks\", \"info\", \"logs\", \"lost-found\", \"modules\",\n+\t\t\"objects\", \"refs\", \"remotes\", \"rr-cache\", \"svn\",\n+\t\tNULL\n+\t};\n+\tconst char *common_top_file_list[] = {\n+\t\t\"config\", \"gc.pid\", \"packed-refs\", \"shallow\", NULL\n+\t};\n+\tchar *base = buf->buf + git_dir_len;\n+\tconst char **p;\n+\tif (is_dir_file(base, \"logs\", \"HEAD\"))\n+\t\treturn;\t/* keep this in $GIT_DIR */\n+\tfor (p = common_dir_list; *p; p++)\n+\t\tif (dir_prefix(base, *p)) {\n+\t\t\treplace_dir(buf, git_dir_len, get_git_common_dir());\n+\t\t\treturn;\n+\t\t}\n+\tfor (p = common_top_file_list; *p; p++)\n+\t\tif (!strcmp(base, *p)) {\n+\t\t\treplace_dir(buf, git_dir_len, get_git_common_dir());\n+\t\t\treturn;\n+\t\t}\n+}\n+\n static void adjust_git_path(struct strbuf *buf, int git_dir_len)\n {\n \tconst char *base = buf->buf + git_dir_len;\n@@ -101,6 +127,8 @@ static void adjust_git_path(struct strbuf *buf, int git_dir_len)\n \t\t\t get_index_file(), strlen(get_index_file()));\n \telse if (git_db_env && dir_prefix(base, \"objects\"))\n \t\treplace_dir(buf, git_dir_len + 7, get_object_directory());\n+\telse if (git_common_dir_env)\n+\t\tupdate_common_dir(buf, git_dir_len);\n }\n \n static void do_git_path(struct strbuf *buf, const char *fmt, va_list args)\ndiff --git a/t/t0060-path-utils.sh b/t/t0060-path-utils.sh\nindex 1d29901..f9a77e4 100755\n--- a/t/t0060-path-utils.sh\n+++ b/t/t0060-path-utils.sh\n@@ -241,5 +241,20 @@ test_expect_success 'setup fake objects directory foo' 'mkdir foo'\n test_git_path GIT_OBJECT_DIRECTORY=foo objects foo\n test_git_path GIT_OBJECT_DIRECTORY=foo objects/foo foo/foo\n test_git_path GIT_OBJECT_DIRECTORY=foo objects2 .git/objects2\n+test_expect_success 'setup common repository' 'git --git-dir=bar init'\n+test_git_path GIT_COMMON_DIR=bar index .git/index\n+test_git_path GIT_COMMON_DIR=bar HEAD .git/HEAD\n+test_git_path GIT_COMMON_DIR=bar logs/HEAD .git/logs/HEAD\n+test_git_path GIT_COMMON_DIR=bar objects bar/objects\n+test_git_path GIT_COMMON_DIR=bar objects/bar bar/objects/bar\n+test_git_path GIT_COMMON_DIR=bar info/exclude bar/info/exclude\n+test_git_path GIT_COMMON_DIR=bar remotes/bar bar/remotes/bar\n+test_git_path GIT_COMMON_DIR=bar branches/bar bar/branches/bar\n+test_git_path GIT_COMMON_DIR=bar logs/refs/heads/master bar/logs/refs/heads/master\n+test_git_path GIT_COMMON_DIR=bar refs/heads/master bar/refs/heads/master\n+test_git_path GIT_COMMON_DIR=bar hooks/me bar/hooks/me\n+test_git_path GIT_COMMON_DIR=bar config bar/config\n+test_git_path GIT_COMMON_DIR=bar packed-refs bar/packed-refs\n+test_git_path GIT_COMMON_DIR=bar shallow bar/shallow\n \n test_done\n-- \n1.8.5.2.240.g8478abd\n"},{"id":"234974","messageId":"1392730814-19656-12-git-send-email-pclouds@gmail.com","threadId":"35908","inReplyTo":"1392730814-19656-1-git-send-email-pclouds@gmail.com","subject":"[PATCH v3 11/25] git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2014-02-18T13:40:00Z","receivedAt":"2014-02-18T13:40:00Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"If $GIT_COMMON_DIR is set, $GIT_OBJECT_DIRECTORY should be\n$GIT_COMMON_DIR/objects, not $GIT_DIR/objects. Just let rev-parse\n--git-path handle it.\n\nSigned-off-by: Nguyễn Thái Ngọc Duy \n---\n git-sh-setup.sh | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/git-sh-setup.sh b/git-sh-setup.sh\nindex fffa3c7..fec9430 100644\n--- a/git-sh-setup.sh\n+++ b/git-sh-setup.sh\n@@ -343,7 +343,7 @@ then\n \t\techo >&2 \"Unable to determine absolute path of git directory\"\n \t\texit 1\n \t}\n-\t: ${GIT_OBJECT_DIRECTORY=\"$GIT_DIR/objects\"}\n+\t: ${GIT_OBJECT_DIRECTORY=\"`git rev-parse --git-path objects`\"}\n fi\n \n peel_committish () {\n-- \n1.8.5.2.240.g8478abd\n"},{"id":"234977","messageId":"1392730814-19656-13-git-send-email-pclouds@gmail.com","threadId":"35908","inReplyTo":"1392730814-19656-1-git-send-email-pclouds@gmail.com","subject":"[PATCH v3 12/25] *.sh: avoid hardcoding $GIT_DIR/hooks/...","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2014-02-18T13:40:01Z","receivedAt":"2014-02-18T13:40:01Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"If $GIT_COMMON_DIR is set, it should be $GIT_COMMON_DIR/hooks/, not\n$GIT_DIR/hooks/. Just let rev-parse --git-path handle it.\n\nSigned-off-by: Nguyễn Thái Ngọc Duy \n---\n git-am.sh | 22 +++++++++++-----------\n git-rebase--interactive.sh | 6 +++---\n git-rebase--merge.sh | 6 ++----\n git-rebase.sh | 4 ++--\n templates/hooks--applypatch-msg.sample | 4 ++--\n templates/hooks--pre-applypatch.sample | 4 ++--\n 6 files changed, 22 insertions(+), 24 deletions(-)\n\ndiff --git a/git-am.sh b/git-am.sh\nindex bbea430..dfa0618 100755\n--- a/git-am.sh\n+++ b/git-am.sh\n@@ -803,10 +803,10 @@ To restore the original branch and stop patching run \\\"\\$cmdline --abort\\\".\"\n \t\tcontinue\n \tfi\n \n-\tif test -x \"$GIT_DIR\"/hooks/applypatch-msg\n+\thook=\"`git rev-parse --git-path hooks/applypatch-msg`\"\n+\tif test -x \"$hook\"\n \tthen\n-\t\t\"$GIT_DIR\"/hooks/applypatch-msg \"$dotest/final-commit\" ||\n-\t\tstop_here $this\n+\t\t\"$hook\" \"$dotest/final-commit\" || stop_here $this\n \tfi\n \n \tif test -f \"$dotest/final-commit\"\n@@ -880,9 +880,10 @@ did you forget to use 'git add'?\"\n \t\tstop_here_user_resolve $this\n \tfi\n \n-\tif test -x \"$GIT_DIR\"/hooks/pre-applypatch\n+\thook=\"`git rev-parse --git-path hooks/pre-applypatch`\"\n+\tif test -x \"$hook\"\n \tthen\n-\t\t\"$GIT_DIR\"/hooks/pre-applypatch || stop_here $this\n+\t\t\"$hook\" || stop_here $this\n \tfi\n \n \ttree=$(git write-tree) &&\n@@ -908,18 +909,17 @@ did you forget to use 'git add'?\"\n \t\techo \"$(cat \"$dotest/original-commit\") $commit\" >> \"$dotest/rewritten\"\n \tfi\n \n-\tif test -x \"$GIT_DIR\"/hooks/post-applypatch\n-\tthen\n-\t\t\"$GIT_DIR\"/hooks/post-applypatch\n-\tfi\n+\thook=\"`git rev-parse --git-path hooks/post-applypatch`\"\n+\ttest -x \"$hook\" && \"$hook\"\n \n \tgo_next\n done\n \n if test -s \"$dotest\"/rewritten; then\n git notes copy --for-rewrite=rebase < \"$dotest\"/rewritten\n- if test -x \"$GIT_DIR\"/hooks/post-rewrite; then\n-\t\"$GIT_DIR\"/hooks/post-rewrite rebase < \"$dotest\"/rewritten\n+ hook=\"`git rev-parse --git-path hooks/post-rewrite`\"\n+ if test -x \"$hook\"; then\n+\t\"$hook\" rebase < \"$dotest\"/rewritten\n fi\n fi\n \ndiff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh\nindex 43c19e0..d741b04 100644\n--- a/git-rebase--interactive.sh\n+++ b/git-rebase--interactive.sh\n@@ -632,9 +632,9 @@ do_next () {\n \t\tgit notes copy --for-rewrite=rebase < \"$rewritten_list\" ||\n \t\ttrue # we don't care if this copying failed\n \t} &&\n-\tif test -x \"$GIT_DIR\"/hooks/post-rewrite &&\n-\t\ttest -s \"$rewritten_list\"; then\n-\t\t\"$GIT_DIR\"/hooks/post-rewrite rebase < \"$rewritten_list\"\n+\thook=\"`git rev-parse --git-path hooks/post-rewrite`\"\n+\tif test -x \"$hook\" && test -s \"$rewritten_list\"; then\n+\t\t\"$hook\" rebase < \"$rewritten_list\"\n \t\ttrue # we don't care if this hook failed\n \tfi &&\n \twarn \"Successfully rebased and updated $head_name.\"\ndiff --git a/git-rebase--merge.sh b/git-rebase--merge.sh\nindex e7d96de..68f5d09 100644\n--- a/git-rebase--merge.sh\n+++ b/git-rebase--merge.sh\n@@ -93,10 +93,8 @@ finish_rb_merge () {\n \tif test -s \"$state_dir\"/rewritten\n \tthen\n \t\tgit notes copy --for-rewrite=rebase <\"$state_dir\"/rewritten\n-\t\tif test -x \"$GIT_DIR\"/hooks/post-rewrite\n-\t\tthen\n-\t\t\t\"$GIT_DIR\"/hooks/post-rewrite rebase <\"$state_dir\"/rewritten\n-\t\tfi\n+\t\thook=\"`git rev-parse --git-path hooks/post-rewrite`\"\n+\t\ttest -x \"$hook\" && \"$hook\" rebase <\"$state_dir\"/rewritten\n \tfi\n \tsay All done.\n }\ndiff --git a/git-rebase.sh b/git-rebase.sh\nindex 8a3efa2..1cf8dba 100755\n--- a/git-rebase.sh\n+++ b/git-rebase.sh\n@@ -195,9 +195,9 @@ run_specific_rebase () {\n \n run_pre_rebase_hook () {\n \tif test -z \"$ok_to_skip_pre_rebase\" &&\n-\t test -x \"$GIT_DIR/hooks/pre-rebase\"\n+\t test -x \"`git rev-parse --git-path hooks/pre-rebase`\"\n \tthen\n-\t\t\"$GIT_DIR/hooks/pre-rebase\" ${1+\"$@\"} ||\n+\t\t\"`git rev-parse --git-path hooks/pre-rebase`\" ${1+\"$@\"} ||\n \t\tdie \"$(gettext \"The pre-rebase hook refused to rebase.\")\"\n \tfi\n }\ndiff --git a/templates/hooks--applypatch-msg.sample b/templates/hooks--applypatch-msg.sample\nindex 8b2a2fe..28b843b 100755\n--- a/templates/hooks--applypatch-msg.sample\n+++ b/templates/hooks--applypatch-msg.sample\n@@ -10,6 +10,6 @@\n # To enable this hook, rename this file to \"applypatch-msg\".\n \n . git-sh-setup\n-test -x \"$GIT_DIR/hooks/commit-msg\" &&\n-\texec \"$GIT_DIR/hooks/commit-msg\" ${1+\"$@\"}\n+commitmsg=\"`git rev-parse --git-path hooks/commit-msg`\"\n+test -x \"$commitmsg\" && exec \"$commitmsg\" ${1+\"$@\"}\n :\ndiff --git a/templates/hooks--pre-applypatch.sample b/templates/hooks--pre-applypatch.sample\nindex b1f187c..51aa244 100755\n--- a/templates/hooks--pre-applypatch.sample\n+++ b/templates/hooks--pre-applypatch.sample\n@@ -9,6 +9,6 @@\n # To enable this hook, rename this file to \"pre-applypatch\".\n \n . git-sh-setup\n-test -x \"$GIT_DIR/hooks/pre-commit\" &&\n-\texec \"$GIT_DIR/hooks/pre-commit\" ${1+\"$@\"}\n+precommit=\"`git rev-parse --git-path hooks/pre-commit`\"\n+test -x \"$precommit\" && exec \"$precommit\" ${1+\"$@\"}\n :\n-- \n1.8.5.2.240.g8478abd\n"},{"id":"234976","messageId":"1392730814-19656-14-git-send-email-pclouds@gmail.com","threadId":"35908","inReplyTo":"1392730814-19656-1-git-send-email-pclouds@gmail.com","subject":"[PATCH v3 13/25] git-stash: avoid hardcoding $GIT_DIR/logs/....","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2014-02-18T13:40:02Z","receivedAt":"2014-02-18T13:40:02Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"Signed-off-by: Nguyễn Thái Ngọc Duy \n---\n git-stash.sh | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/git-stash.sh b/git-stash.sh\nindex ae7d16e..12d9b37 100755\n--- a/git-stash.sh\n+++ b/git-stash.sh\n@@ -183,7 +183,7 @@ store_stash () {\n \tfi\n \n \t# Make sure the reflog for stash is kept.\n-\t: >>\"$GIT_DIR/logs/$ref_stash\"\n+\t: >>\"`git rev-parse --git-path logs/$ref_stash`\"\n \tgit update-ref -m \"$stash_msg\" $ref_stash $w_commit\n \tret=$?\n \ttest $ret != 0 && test -z $quiet &&\n@@ -258,7 +258,7 @@ save_stash () {\n \t\tsay \"$(gettext \"No local changes to save\")\"\n \t\texit 0\n \tfi\n-\ttest -f \"$GIT_DIR/logs/$ref_stash\" ||\n+\ttest -f \"`git rev-parse --git-path logs/$ref_stash`\" ||\n \t\tclear_stash || die \"$(gettext \"Cannot initialize stash\")\"\n \n \tcreate_stash \"$stash_msg\" $untracked\n-- \n1.8.5.2.240.g8478abd\n"},{"id":"234978","messageId":"1392730814-19656-15-git-send-email-pclouds@gmail.com","threadId":"35908","inReplyTo":"1392730814-19656-1-git-send-email-pclouds@gmail.com","subject":"[PATCH v3 14/25] setup.c: convert is_git_directory() to use strbuf","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2014-02-18T13:40:03Z","receivedAt":"2014-02-18T13:40:03Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"Signed-off-by: Nguyễn Thái Ngọc Duy \n---\n setup.c | 35 +++++++++++++++++++----------------\n strbuf.h | 4 ++++\n 2 files changed, 23 insertions(+), 16 deletions(-)\n\ndiff --git a/setup.c b/setup.c\nindex 6c3f85f..999225b 100644\n--- a/setup.c\n+++ b/setup.c\n@@ -184,31 +184,34 @@ void verify_non_filename(const char *prefix, const char *arg)\n */\n int is_git_directory(const char *suspect)\n {\n-\tchar path[PATH_MAX];\n-\tsize_t len = strlen(suspect);\n+\tstruct strbuf path = STRBUF_INIT;\n+\tint ret = 0;\n+\tsize_t len;\n \n-\tif (PATH_MAX <= len + strlen(\"/objects\"))\n-\t\tdie(\"Too long path: %.*s\", 60, suspect);\n-\tstrcpy(path, suspect);\n+\tstrbuf_addstr(&path, suspect);\n+\tlen = path.len;\n \tif (getenv(DB_ENVIRONMENT)) {\n \t\tif (access(getenv(DB_ENVIRONMENT), X_OK))\n-\t\t\treturn 0;\n+\t\t\tgoto done;\n \t}\n \telse {\n-\t\tstrcpy(path + len, \"/objects\");\n-\t\tif (access(path, X_OK))\n-\t\t\treturn 0;\n+\t\tstrbuf_addstr(&path, \"/objects\");\n+\t\tif (access(path.buf, X_OK))\n+\t\t\tgoto done;\n \t}\n \n-\tstrcpy(path + len, \"/refs\");\n-\tif (access(path, X_OK))\n-\t\treturn 0;\n+\tstrbuf_addstr_at(&path, len, \"/refs\");\n+\tif (access(path.buf, X_OK))\n+\t\tgoto done;\n \n-\tstrcpy(path + len, \"/HEAD\");\n-\tif (validate_headref(path))\n-\t\treturn 0;\n+\tstrbuf_addstr_at(&path, len, \"/HEAD\");\n+\tif (validate_headref(path.buf))\n+\t\tgoto done;\n \n-\treturn 1;\n+\tret = 1;\n+done:\n+\tstrbuf_release(&path);\n+\treturn ret;\n }\n \n int is_inside_git_dir(void)\ndiff --git a/strbuf.h b/strbuf.h\nindex 73e80ce..aec9fdb 100644\n--- a/strbuf.h\n+++ b/strbuf.h\n@@ -116,6 +116,10 @@ extern void strbuf_add(struct strbuf *, const void *, size_t);\n static inline void strbuf_addstr(struct strbuf *sb, const char *s) {\n \tstrbuf_add(sb, s, strlen(s));\n }\n+static inline void strbuf_addstr_at(struct strbuf *sb, size_t len, const char *s) {\n+\tstrbuf_setlen(sb, len);\n+\tstrbuf_add(sb, s, strlen(s));\n+}\n static inline void strbuf_addbuf(struct strbuf *sb, const struct strbuf *sb2) {\n \tstrbuf_grow(sb, sb2->len);\n \tstrbuf_add(sb, sb2->buf, sb2->len);\n-- \n1.8.5.2.240.g8478abd\n"},{"id":"234979","messageId":"1392730814-19656-16-git-send-email-pclouds@gmail.com","threadId":"35908","inReplyTo":"1392730814-19656-1-git-send-email-pclouds@gmail.com","subject":"[PATCH v3 15/25] setup.c: detect $GIT_COMMON_DIR in is_git_directory()","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2014-02-18T13:40:04Z","receivedAt":"2014-02-18T13:40:04Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"If the file \"$GIT_DIR/commondir\" exists, it contains the value of\n$GIT_COMMON_DIR.\n\nSigned-off-by: Nguyễn Thái Ngọc Duy \n---\n Documentation/gitrepository-layout.txt | 4 ++++\n setup.c | 38 ++++++++++++++++++++++++++++------\n strbuf.c | 8 +++++++\n strbuf.h | 1 +\n 4 files changed, 45 insertions(+), 6 deletions(-)\n\ndiff --git a/Documentation/gitrepository-layout.txt b/Documentation/gitrepository-layout.txt\nindex aa03882..9bfe0f1 100644\n--- a/Documentation/gitrepository-layout.txt\n+++ b/Documentation/gitrepository-layout.txt\n@@ -211,6 +211,10 @@ shallow::\n \tand maintained by shallow clone mechanism. See `--depth`\n \toption to linkgit:git-clone[1] and linkgit:git-fetch[1].\n \n+commondir::\n+\tIf this file exists, $GIT_COMMON_DIR will be set to the path\n+\tspecified in this file if it is not set.\n+\n modules::\n \tContains the git-repositories of the submodules.\n \ndiff --git a/setup.c b/setup.c\nindex 999225b..4e5711c 100644\n--- a/setup.c\n+++ b/setup.c\n@@ -170,6 +170,30 @@ void verify_non_filename(const char *prefix, const char *arg)\n \t \"'git [...] -- [...]'\", arg);\n }\n \n+static void get_common_dir(struct strbuf *sb, const char *gitdir)\n+{\n+\tstruct strbuf data = STRBUF_INIT;\n+\tstruct strbuf path = STRBUF_INIT;\n+\tconst char *git_common_dir = getenv(GIT_COMMON_DIR_ENVIRONMENT);\n+\tif (git_common_dir) {\n+\t\tstrbuf_addstr(sb, git_common_dir);\n+\t\treturn;\n+\t}\n+\tstrbuf_addf(&path, \"%s/commondir\", gitdir);\n+\tif (file_exists(path.buf)) {\n+\t\tif (strbuf_read_file(&data, path.buf, 0) <= 0)\n+\t\t\tdie_errno(_(\"failed to read %s\"), path.buf);\n+\t\tstrbuf_chomp(&data);\n+\t\tstrbuf_reset(&path);\n+\t\tif (!is_absolute_path(data.buf))\n+\t\t\tstrbuf_addf(&path, \"%s/\", gitdir);\n+\t\tstrbuf_addbuf(&path, &data);\n+\t\tstrbuf_addstr(sb, real_path(path.buf));\n+\t} else\n+\t\tstrbuf_addstr(sb, gitdir);\n+\tstrbuf_release(&data);\n+\tstrbuf_release(&path);\n+}\n \n /*\n * Test if it looks like we're at a git directory.\n@@ -188,14 +212,20 @@ int is_git_directory(const char *suspect)\n \tint ret = 0;\n \tsize_t len;\n \n-\tstrbuf_addstr(&path, suspect);\n+\tstrbuf_addf(&path, \"%s/HEAD\", suspect);\n+\tif (validate_headref(path.buf))\n+\t\tgoto done;\n+\n+\tstrbuf_reset(&path);\n+\tget_common_dir(&path, suspect);\n \tlen = path.len;\n+\n \tif (getenv(DB_ENVIRONMENT)) {\n \t\tif (access(getenv(DB_ENVIRONMENT), X_OK))\n \t\t\tgoto done;\n \t}\n \telse {\n-\t\tstrbuf_addstr(&path, \"/objects\");\n+\t\tstrbuf_addstr_at(&path, len, \"/objects\");\n \t\tif (access(path.buf, X_OK))\n \t\t\tgoto done;\n \t}\n@@ -204,10 +234,6 @@ int is_git_directory(const char *suspect)\n \tif (access(path.buf, X_OK))\n \t\tgoto done;\n \n-\tstrbuf_addstr_at(&path, len, \"/HEAD\");\n-\tif (validate_headref(path.buf))\n-\t\tgoto done;\n-\n \tret = 1;\n done:\n \tstrbuf_release(&path);\ndiff --git a/strbuf.c b/strbuf.c\nindex 83caf4a..e17c358 100644\n--- a/strbuf.c\n+++ b/strbuf.c\n@@ -588,3 +588,11 @@ int fprintf_ln(FILE *fp, const char *fmt, ...)\n \t\treturn -1;\n \treturn ret + 1;\n }\n+\n+void strbuf_chomp(struct strbuf *sb)\n+{\n+\twhile (sb->len && (sb->buf[sb->len - 1] == '\\n' ||\n+\t\t\t sb->buf[sb->len - 1] == '\\r'))\n+\t\tsb->len--;\n+\tsb->buf[sb->len] = '\\0';\n+}\ndiff --git a/strbuf.h b/strbuf.h\nindex aec9fdb..cd9578f 100644\n--- a/strbuf.h\n+++ b/strbuf.h\n@@ -109,6 +109,7 @@ extern void strbuf_remove(struct strbuf *, size_t pos, size_t len);\n /* splice pos..pos+len with given data */\n extern void strbuf_splice(struct strbuf *, size_t pos, size_t len,\n const void *, size_t);\n+extern void strbuf_chomp(struct strbuf *sb);\n \n extern void strbuf_add_commented_lines(struct strbuf *out, const char *buf, size_t size);\n \n-- \n1.8.5.2.240.g8478abd\n"},{"id":"234981","messageId":"1392730814-19656-17-git-send-email-pclouds@gmail.com","threadId":"35908","inReplyTo":"1392730814-19656-1-git-send-email-pclouds@gmail.com","subject":"[PATCH v3 16/25] setup.c: convert check_repository_format_gently to use strbuf","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2014-02-18T13:40:05Z","receivedAt":"2014-02-18T13:40:05Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"Signed-off-by: Nguyễn Thái Ngọc Duy \n---\n setup.c | 12 ++++++++----\n 1 file changed, 8 insertions(+), 4 deletions(-)\n\ndiff --git a/setup.c b/setup.c\nindex 4e5711c..282fdc9 100644\n--- a/setup.c\n+++ b/setup.c\n@@ -281,7 +281,9 @@ void setup_work_tree(void)\n \n static int check_repository_format_gently(const char *gitdir, int *nongit_ok)\n {\n-\tchar repo_config[PATH_MAX+1];\n+\tstruct strbuf sb = STRBUF_INIT;\n+\tconst char *repo_config;\n+\tint ret = 0;\n \n \t/*\n \t * git_config() can't be used here because it calls git_pathdup()\n@@ -292,7 +294,8 @@ static int check_repository_format_gently(const char *gitdir, int *nongit_ok)\n \t * Use a gentler version of git_config() to check if this repo\n \t * is a good one.\n \t */\n-\tsnprintf(repo_config, PATH_MAX, \"%s/config\", gitdir);\n+\tstrbuf_addf(&sb, \"%s/config\", gitdir);\n+\trepo_config = sb.buf;\n \tgit_config_early(check_repository_format_version, NULL, repo_config);\n \tif (GIT_REPO_VERSION < repository_format_version) {\n \t\tif (!nongit_ok)\n@@ -302,9 +305,10 @@ static int check_repository_format_gently(const char *gitdir, int *nongit_ok)\n \t\t\tGIT_REPO_VERSION, repository_format_version);\n \t\twarning(\"Please upgrade Git\");\n \t\t*nongit_ok = -1;\n-\t\treturn -1;\n+\t\tret = -1;\n \t}\n-\treturn 0;\n+\tstrbuf_release(&sb);\n+\treturn ret;\n }\n \n /*\n-- \n1.8.5.2.240.g8478abd\n"},{"id":"234980","messageId":"1392730814-19656-18-git-send-email-pclouds@gmail.com","threadId":"35908","inReplyTo":"1392730814-19656-1-git-send-email-pclouds@gmail.com","subject":"[PATCH v3 17/25] setup.c: detect $GIT_COMMON_DIR check_repository_format_gently()","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2014-02-18T13:40:06Z","receivedAt":"2014-02-18T13:40:06Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"Signed-off-by: Nguyễn Thái Ngọc Duy \n---\n setup.c | 6 ++++--\n 1 file changed, 4 insertions(+), 2 deletions(-)\n\ndiff --git a/setup.c b/setup.c\nindex 282fdc9..e56ec11 100644\n--- a/setup.c\n+++ b/setup.c\n@@ -285,6 +285,10 @@ static int check_repository_format_gently(const char *gitdir, int *nongit_ok)\n \tconst char *repo_config;\n \tint ret = 0;\n \n+\tget_common_dir(&sb, gitdir);\n+\tstrbuf_addstr(&sb, \"/config\");\n+\trepo_config = sb.buf;\n+\n \t/*\n \t * git_config() can't be used here because it calls git_pathdup()\n \t * to get $GIT_CONFIG/config. That call will make setup_git_env()\n@@ -294,8 +298,6 @@ static int check_repository_format_gently(const char *gitdir, int *nongit_ok)\n \t * Use a gentler version of git_config() to check if this repo\n \t * is a good one.\n \t */\n-\tstrbuf_addf(&sb, \"%s/config\", gitdir);\n-\trepo_config = sb.buf;\n \tgit_config_early(check_repository_format_version, NULL, repo_config);\n \tif (GIT_REPO_VERSION < repository_format_version) {\n \t\tif (!nongit_ok)\n-- \n1.8.5.2.240.g8478abd\n"},{"id":"234988","messageId":"1392730814-19656-19-git-send-email-pclouds@gmail.com","threadId":"35908","inReplyTo":"1392730814-19656-1-git-send-email-pclouds@gmail.com","subject":"[PATCH v3 18/25] setup.c: support multi-checkout repo setup","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2014-02-18T13:40:07Z","receivedAt":"2014-02-18T13:40:07Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"The repo setup procedure is updated to detect $GIT_DIR/commondir and\nset $GIT_COMMON_DIR properly.\n\nThe core.worktree is ignored when $GIT_DIR/commondir presents. This is\nbecause \"commondir\" repos are intended for separate/linked checkouts\nand pointing them back to a fixed core.worktree just does not make\nsense.\n\nSigned-off-by: Nguyễn Thái Ngọc Duy \n---\n Documentation/config.txt | 3 +-\n Documentation/git-rev-parse.txt | 3 ++\n builtin/rev-parse.c | 4 +++\n cache.h | 1 +\n environment.c | 8 ++---\n setup.c | 33 +++++++++++++-----\n t/t1501-worktree.sh | 76 +++++++++++++++++++++++++++++++++++++++++\n t/t1510-repo-setup.sh | 1 +\n trace.c | 1 +\n 9 files changed, 115 insertions(+), 15 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex 5f4d793..cbf4d97 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -381,7 +381,8 @@ false), while all other repositories are assumed to be bare (bare\n \n core.worktree::\n \tSet the path to the root of the working tree.\n-\tThis can be overridden by the GIT_WORK_TREE environment\n+\tThis can be overridden by the GIT_WORK_TREE\n+\tor GIT_COMMON_DIR environment\n \tvariable and the '--work-tree' command line option.\n \tThe value can be an absolute path or relative to the path to\n \tthe .git directory, which is either specified by --git-dir\ndiff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt\nindex 33e4e90..8e6ad32 100644\n--- a/Documentation/git-rev-parse.txt\n+++ b/Documentation/git-rev-parse.txt\n@@ -215,6 +215,9 @@ If `$GIT_DIR` is not defined and the current directory\n is not detected to lie in a Git repository or work tree\n print a message to stderr and exit with nonzero status.\n \n+--git-common-dir::\n+\tShow `$GIT_COMMON_DIR` if defined, else `$GIT_DIR`.\n+\n --is-inside-git-dir::\n \tWhen the current working directory is below the repository\n \tdirectory print \"true\", otherwise \"false\".\ndiff --git a/builtin/rev-parse.c b/builtin/rev-parse.c\nindex e50bc65..c7057ce 100644\n--- a/builtin/rev-parse.c\n+++ b/builtin/rev-parse.c\n@@ -744,6 +744,10 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)\n \t\t\t\tprintf(\"%s%s.git\\n\", cwd, len && cwd[len-1] != '/' ? \"/\" : \"\");\n \t\t\t\tcontinue;\n \t\t\t}\n+\t\t\tif (!strcmp(arg, \"--git-common-dir\")) {\n+\t\t\t\tputs(get_git_common_dir());\n+\t\t\t\tcontinue;\n+\t\t\t}\n \t\t\tif (!strcmp(arg, \"--resolve-git-dir\")) {\n \t\t\t\tconst char *gitdir = resolve_gitdir(argv[i+1]);\n \t\t\t\tif (!gitdir)\ndiff --git a/cache.h b/cache.h\nindex 51ade32..98b5dd3 100644\n--- a/cache.h\n+++ b/cache.h\n@@ -407,6 +407,7 @@ extern char *get_object_directory(void);\n extern char *get_index_file(void);\n extern char *get_graft_file(void);\n extern int set_git_dir(const char *path);\n+extern int get_common_dir(struct strbuf *sb, const char *gitdir);\n extern const char *get_git_namespace(void);\n extern const char *strip_namespace(const char *namespaced_ref);\n extern const char *get_git_work_tree(void);\ndiff --git a/environment.c b/environment.c\nindex c998120..0999fc1 100644\n--- a/environment.c\n+++ b/environment.c\n@@ -126,6 +126,7 @@ static char *expand_namespace(const char *raw_namespace)\n \n static void setup_git_env(void)\n {\n+\tstruct strbuf sb = STRBUF_INIT;\n \tconst char *gitfile;\n \tconst char *shallow_file;\n \n@@ -134,12 +135,9 @@ static void setup_git_env(void)\n \t\tgit_dir = DEFAULT_GIT_DIR_ENVIRONMENT;\n \tgitfile = read_gitfile(git_dir);\n \tgit_dir = xstrdup(gitfile ? gitfile : git_dir);\n-\tgit_common_dir = getenv(GIT_COMMON_DIR_ENVIRONMENT);\n-\tif (git_common_dir) {\n+\tif (get_common_dir(&sb, git_dir))\n \t\tgit_common_dir_env = 1;\n-\t\tgit_common_dir = xstrdup(git_common_dir);\n-\t} else\n-\t\tgit_common_dir = git_dir;\n+\tgit_common_dir = strbuf_detach(&sb, NULL);\n \tgit_object_dir = getenv(DB_ENVIRONMENT);\n \tif (!git_object_dir) {\n \t\tgit_object_dir = xmalloc(strlen(git_common_dir) + 9);\ndiff --git a/setup.c b/setup.c\nindex e56ec11..d4ac878 100644\n--- a/setup.c\n+++ b/setup.c\n@@ -170,14 +170,15 @@ void verify_non_filename(const char *prefix, const char *arg)\n \t \"'git [...] -- [...]'\", arg);\n }\n \n-static void get_common_dir(struct strbuf *sb, const char *gitdir)\n+int get_common_dir(struct strbuf *sb, const char *gitdir)\n {\n \tstruct strbuf data = STRBUF_INIT;\n \tstruct strbuf path = STRBUF_INIT;\n \tconst char *git_common_dir = getenv(GIT_COMMON_DIR_ENVIRONMENT);\n+\tint ret = 0;\n \tif (git_common_dir) {\n \t\tstrbuf_addstr(sb, git_common_dir);\n-\t\treturn;\n+\t\treturn 1;\n \t}\n \tstrbuf_addf(&path, \"%s/commondir\", gitdir);\n \tif (file_exists(path.buf)) {\n@@ -189,10 +190,12 @@ static void get_common_dir(struct strbuf *sb, const char *gitdir)\n \t\t\tstrbuf_addf(&path, \"%s/\", gitdir);\n \t\tstrbuf_addbuf(&path, &data);\n \t\tstrbuf_addstr(sb, real_path(path.buf));\n+\t\tret = 1;\n \t} else\n \t\tstrbuf_addstr(sb, gitdir);\n \tstrbuf_release(&data);\n \tstrbuf_release(&path);\n+\treturn ret;\n }\n \n /*\n@@ -279,13 +282,26 @@ void setup_work_tree(void)\n \tinitialized = 1;\n }\n \n+static int check_repo_format(const char *var, const char *value, void *cb)\n+{\n+\tif (strcmp(var, \"core.repositoryformatversion\") == 0)\n+\t\trepository_format_version = git_config_int(var, value);\n+\telse if (strcmp(var, \"core.sharedrepository\") == 0)\n+\t\tshared_repository = git_config_perm(var, value);\n+\treturn 0;\n+}\n+\n static int check_repository_format_gently(const char *gitdir, int *nongit_ok)\n {\n \tstruct strbuf sb = STRBUF_INIT;\n \tconst char *repo_config;\n+\tconfig_fn_t fn;\n \tint ret = 0;\n \n-\tget_common_dir(&sb, gitdir);\n+\tif (get_common_dir(&sb, gitdir))\n+\t\tfn = check_repo_format;\n+\telse\n+\t\tfn = check_repository_format_version;\n \tstrbuf_addstr(&sb, \"/config\");\n \trepo_config = sb.buf;\n \n@@ -298,7 +314,7 @@ static int check_repository_format_gently(const char *gitdir, int *nongit_ok)\n \t * Use a gentler version of git_config() to check if this repo\n \t * is a good one.\n \t */\n-\tgit_config_early(check_repository_format_version, NULL, repo_config);\n+\tgit_config_early(fn, NULL, repo_config);\n \tif (GIT_REPO_VERSION < repository_format_version) {\n \t\tif (!nongit_ok)\n \t\t\tdie (\"Expected git repo version <= %d, found %d\",\n@@ -770,11 +786,10 @@ int git_config_perm(const char *var, const char *value)\n \n int check_repository_format_version(const char *var, const char *value, void *cb)\n {\n-\tif (strcmp(var, \"core.repositoryformatversion\") == 0)\n-\t\trepository_format_version = git_config_int(var, value);\n-\telse if (strcmp(var, \"core.sharedrepository\") == 0)\n-\t\tshared_repository = git_config_perm(var, value);\n-\telse if (strcmp(var, \"core.bare\") == 0) {\n+\tint ret = check_repo_format(var, value, cb);\n+\tif (ret)\n+\t\treturn ret;\n+\tif (strcmp(var, \"core.bare\") == 0) {\n \t\tis_bare_repository_cfg = git_config_bool(var, value);\n \t\tif (is_bare_repository_cfg == 1)\n \t\t\tinside_work_tree = -1;\ndiff --git a/t/t1501-worktree.sh b/t/t1501-worktree.sh\nindex 8f36aa9..d8bdaf4 100755\n--- a/t/t1501-worktree.sh\n+++ b/t/t1501-worktree.sh\n@@ -346,4 +346,80 @@ test_expect_success 'relative $GIT_WORK_TREE and git subprocesses' '\n \ttest_cmp expected actual\n '\n \n+test_expect_success 'Multi-worktree setup' '\n+\tmkdir work &&\n+\tmkdir -p repo.git/repos/foo &&\n+\tcp repo.git/HEAD repo.git/index repo.git/repos/foo &&\n+\tunset GIT_DIR GIT_CONFIG GIT_WORK_TREE\n+'\n+\n+test_expect_success 'GIT_DIR set (1)' '\n+\techo \"gitdir: repo.git/repos/foo\" >gitfile &&\n+\techo ../.. >repo.git/repos/foo/commondir &&\n+\t(\n+\t\tcd work &&\n+\t\tGIT_DIR=../gitfile git rev-parse --git-common-dir >actual &&\n+\t\techo \"$TRASH_DIRECTORY/repo.git\" >expect &&\n+\t\ttest_cmp expect actual\n+\t)\n+'\n+\n+test_expect_success 'GIT_DIR set (2)' '\n+\techo \"gitdir: repo.git/repos/foo\" >gitfile &&\n+\techo \"$TRASH_DIRECTORY/repo.git\" >repo.git/repos/foo/commondir &&\n+\t(\n+\t\tcd work &&\n+\t\tGIT_DIR=../gitfile git rev-parse --git-common-dir >actual &&\n+\t\techo \"$TRASH_DIRECTORY/repo.git\" >expect &&\n+\t\ttest_cmp expect actual\n+\t)\n+'\n+\n+test_expect_success 'Auto discovery' '\n+\techo \"gitdir: repo.git/repos/foo\" >.git &&\n+\techo ../.. >repo.git/repos/foo/commondir &&\n+\t(\n+\t\tcd work &&\n+\t\tgit rev-parse --git-common-dir >actual &&\n+\t\techo \"$TRASH_DIRECTORY/repo.git\" >expect &&\n+\t\ttest_cmp expect actual &&\n+\t\techo haha >data1 &&\n+\t\tgit add data1 &&\n+\t\tgit ls-files --full-name :/ | grep data1 >actual &&\n+\t\techo work/data1 >expect &&\n+\t\ttest_cmp expect actual\n+\t)\n+'\n+\n+test_expect_success '$GIT_DIR/common overrides core.worktree' '\n+\tmkdir elsewhere &&\n+\tgit --git-dir=repo.git config core.worktree \"$TRASH_DIRECTORY/elsewhere\" &&\n+\techo \"gitdir: repo.git/repos/foo\" >.git &&\n+\techo ../.. >repo.git/repos/foo/commondir &&\n+\t(\n+\t\tcd work &&\n+\t\tgit rev-parse --git-common-dir >actual &&\n+\t\techo \"$TRASH_DIRECTORY/repo.git\" >expect &&\n+\t\ttest_cmp expect actual &&\n+\t\techo haha >data2 &&\n+\t\tgit add data2 &&\n+\t\tgit ls-files --full-name :/ | grep data2 >actual &&\n+\t\techo work/data2 >expect &&\n+\t\ttest_cmp expect actual\n+\t)\n+'\n+\n+test_expect_success '$GIT_WORK_TREE overrides $GIT_DIR/common' '\n+\techo \"gitdir: repo.git/repos/foo\" >.git &&\n+\techo ../.. >repo.git/repos/foo/commondir &&\n+\t(\n+\t\tcd work &&\n+\t\techo haha >data3 &&\n+\t\tgit --git-dir=../.git --work-tree=. add data3 &&\n+\t\tgit ls-files --full-name -- :/ | grep data3 >actual &&\n+\t\techo data3 >expect &&\n+\t\ttest_cmp expect actual\n+\t)\n+'\n+\n test_done\ndiff --git a/t/t1510-repo-setup.sh b/t/t1510-repo-setup.sh\nindex cf2ee78..c211ef5 100755\n--- a/t/t1510-repo-setup.sh\n+++ b/t/t1510-repo-setup.sh\n@@ -106,6 +106,7 @@ setup_env () {\n expect () {\n \tcat >\"$1/expected\" <<-EOF\n \tsetup: git_dir: $2\n+\tsetup: git_common_dir: $2\n \tsetup: worktree: $3\n \tsetup: cwd: $4\n \tsetup: prefix: $5\ndiff --git a/trace.c b/trace.c\nindex 08180a9..a594761 100644\n--- a/trace.c\n+++ b/trace.c\n@@ -173,6 +173,7 @@ void trace_repo_setup(const char *prefix)\n \t\tprefix = \"(null)\";\n \n \ttrace_printf_key(key, \"setup: git_dir: %s\\n\", quote_crnl(get_git_dir()));\n+\ttrace_printf_key(key, \"setup: git_common_dir: %s\\n\", quote_crnl(get_git_common_dir()));\n \ttrace_printf_key(key, \"setup: worktree: %s\\n\", quote_crnl(git_work_tree));\n \ttrace_printf_key(key, \"setup: cwd: %s\\n\", quote_crnl(cwd));\n \ttrace_printf_key(key, \"setup: prefix: %s\\n\", quote_crnl(prefix));\n-- \n1.8.5.2.240.g8478abd\n"},{"id":"234985","messageId":"1392730814-19656-20-git-send-email-pclouds@gmail.com","threadId":"35908","inReplyTo":"1392730814-19656-1-git-send-email-pclouds@gmail.com","subject":"[PATCH v3 19/25] wrapper.c: wrapper to open a file, fprintf then close","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2014-02-18T13:40:08Z","receivedAt":"2014-02-18T13:40:08Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"Signed-off-by: Nguyễn Thái Ngọc Duy \n---\n cache.h | 2 ++\n wrapper.c | 31 +++++++++++++++++++++++++++++++\n 2 files changed, 33 insertions(+)\n\ndiff --git a/cache.h b/cache.h\nindex 98b5dd3..99b86d9 100644\n--- a/cache.h\n+++ b/cache.h\n@@ -1239,6 +1239,8 @@ static inline ssize_t write_str_in_full(int fd, const char *str)\n {\n \treturn write_in_full(fd, str, strlen(str));\n }\n+__attribute__((format (printf,3,4)))\n+extern int write_file(const char *path, int fatal, const char *fmt, ...);\n \n /* pager.c */\n extern void setup_pager(void);\ndiff --git a/wrapper.c b/wrapper.c\nindex 0cc5636..5ced50d 100644\n--- a/wrapper.c\n+++ b/wrapper.c\n@@ -455,3 +455,34 @@ struct passwd *xgetpwuid_self(void)\n \t\t errno ? strerror(errno) : _(\"no such user\"));\n \treturn pw;\n }\n+\n+int write_file(const char *path, int fatal, const char *fmt, ...)\n+{\n+\tstruct strbuf sb = STRBUF_INIT;\n+\tint fd = open(path, O_RDWR | O_CREAT | O_TRUNC, 0666);\n+\tva_list params;\n+\tif (fd < 0) {\n+\t\tif (fatal)\n+\t\t\tdie_errno(_(\"could not open %s for writing\"), path);\n+\t\treturn -1;\n+\t}\n+\tva_start(params, fmt);\n+\tstrbuf_vaddf(&sb, fmt, params);\n+\tva_end(params);\n+\tif (write_in_full(fd, sb.buf, sb.len) != sb.len) {\n+\t\tint err = errno;\n+\t\tclose(fd);\n+\t\terrno = err;\n+\t\tstrbuf_release(&sb);\n+\t\tif (fatal)\n+\t\t\tdie_errno(_(\"could not write to %s\"), path);\n+\t\treturn -1;\n+\t}\n+\tstrbuf_release(&sb);\n+\tif (close(fd)) {\n+\t\tif (fatal)\n+\t\t\tdie_errno(_(\"could not close %s\"), path);\n+\t\treturn -1;\n+\t}\n+\treturn 0;\n+}\n-- \n1.8.5.2.240.g8478abd\n"},{"id":"234986","messageId":"1392730814-19656-21-git-send-email-pclouds@gmail.com","threadId":"35908","inReplyTo":"1392730814-19656-1-git-send-email-pclouds@gmail.com","subject":"[PATCH v3 20/25] use new wrapper write_file() for simple file writing","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2014-02-18T13:40:09Z","receivedAt":"2014-02-18T13:40:09Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"This fixes common problems in these code about error handling,\nforgetting to close the file handle after fprintf() fails, or not\nprinting out the error string..\n\nSigned-off-by: Nguyễn Thái Ngọc Duy \n---\n builtin/branch.c | 4 +---\n builtin/init-db.c | 7 +------\n daemon.c | 11 +----------\n submodule.c | 9 ++-------\n transport.c | 8 +++-----\n 5 files changed, 8 insertions(+), 31 deletions(-)\n\ndiff --git a/builtin/branch.c b/builtin/branch.c\nindex b4d7716..3eebdbc 100644\n--- a/builtin/branch.c\n+++ b/builtin/branch.c\n@@ -754,7 +754,6 @@ static const char edit_description[] = \"BRANCH_DESCRIPTION\";\n \n static int edit_branch_description(const char *branch_name)\n {\n-\tFILE *fp;\n \tint status;\n \tstruct strbuf buf = STRBUF_INIT;\n \tstruct strbuf name = STRBUF_INIT;\n@@ -767,8 +766,7 @@ static int edit_branch_description(const char *branch_name)\n \t\t \" %s\\n\"\n \t\t \"Lines starting with '%c' will be stripped.\\n\",\n \t\t branch_name, comment_line_char);\n-\tfp = fopen(git_path(edit_description), \"w\");\n-\tif ((fwrite(buf.buf, 1, buf.len, fp) < buf.len) || fclose(fp)) {\n+\tif (write_file(git_path(edit_description), 0, \"%s\", buf.buf)) {\n \t\tstrbuf_release(&buf);\n \t\treturn error(_(\"could not write branch description template: %s\"),\n \t\t\t strerror(errno));\ndiff --git a/builtin/init-db.c b/builtin/init-db.c\nindex c7c76bb..081e512 100644\n--- a/builtin/init-db.c\n+++ b/builtin/init-db.c\n@@ -342,7 +342,6 @@ int set_git_dir_init(const char *git_dir, const char *real_git_dir,\n static void separate_git_dir(const char *git_dir)\n {\n \tstruct stat st;\n-\tFILE *fp;\n \n \tif (!stat(git_link, &st)) {\n \t\tconst char *src;\n@@ -358,11 +357,7 @@ static void separate_git_dir(const char *git_dir)\n \t\t\tdie_errno(_(\"unable to move %s to %s\"), src, git_dir);\n \t}\n \n-\tfp = fopen(git_link, \"w\");\n-\tif (!fp)\n-\t\tdie(_(\"Could not create git link %s\"), git_link);\n-\tfprintf(fp, \"gitdir: %s\\n\", git_dir);\n-\tfclose(fp);\n+\twrite_file(git_link, 1, \"gitdir: %s\\n\", git_dir);\n }\n \n int init_db(const char *template_dir, unsigned int flags)\ndiff --git a/daemon.c b/daemon.c\nindex 503e039..b880d30 100644\n--- a/daemon.c\n+++ b/daemon.c\n@@ -1122,15 +1122,6 @@ static void daemonize(void)\n }\n #endif\n \n-static void store_pid(const char *path)\n-{\n-\tFILE *f = fopen(path, \"w\");\n-\tif (!f)\n-\t\tdie_errno(\"cannot open pid file '%s'\", path);\n-\tif (fprintf(f, \"%\"PRIuMAX\"\\n\", (uintmax_t) getpid()) < 0 || fclose(f) != 0)\n-\t\tdie_errno(\"failed to write pid file '%s'\", path);\n-}\n-\n static int serve(struct string_list *listen_addr, int listen_port,\n struct credentials *cred)\n {\n@@ -1339,7 +1330,7 @@ int main(int argc, char **argv)\n \t\tsanitize_stdfds();\n \n \tif (pid_file)\n-\t\tstore_pid(pid_file);\n+\t\twrite_file(pid_file, 1, \"%\"PRIuMAX\"\\n\", (uintmax_t) getpid());\n \n \t/* prepare argv for serving-processes */\n \tcld_argv = xmalloc(sizeof (char *) * (argc + 2));\ndiff --git a/submodule.c b/submodule.c\nindex 613857e..fe5748d 100644\n--- a/submodule.c\n+++ b/submodule.c\n@@ -1135,16 +1135,11 @@ void connect_work_tree_and_git_dir(const char *work_tree, const char *git_dir)\n \tstruct strbuf file_name = STRBUF_INIT;\n \tstruct strbuf rel_path = STRBUF_INIT;\n \tconst char *real_work_tree = xstrdup(real_path(work_tree));\n-\tFILE *fp;\n \n \t/* Update gitfile */\n \tstrbuf_addf(&file_name, \"%s/.git\", work_tree);\n-\tfp = fopen(file_name.buf, \"w\");\n-\tif (!fp)\n-\t\tdie(_(\"Could not create git link %s\"), file_name.buf);\n-\tfprintf(fp, \"gitdir: %s\\n\", relative_path(git_dir, real_work_tree,\n-\t\t\t\t\t\t &rel_path));\n-\tfclose(fp);\n+\twrite_file(file_name.buf, 1, \"gitdir: %s\\n\",\n+\t\t relative_path(git_dir, real_work_tree, &rel_path));\n \n \t/* Update core.worktree setting */\n \tstrbuf_reset(&file_name);\ndiff --git a/transport.c b/transport.c\nindex ca7bb44..2df8a15 100644\n--- a/transport.c\n+++ b/transport.c\n@@ -294,7 +294,6 @@ static int write_one_ref(const char *name, const unsigned char *sha1,\n {\n \tstruct strbuf *buf = data;\n \tint len = buf->len;\n-\tFILE *f;\n \n \t/* when called via for_each_ref(), flags is non-zero */\n \tif (flags && !starts_with(name, \"refs/heads/\") &&\n@@ -303,10 +302,9 @@ static int write_one_ref(const char *name, const unsigned char *sha1,\n \n \tstrbuf_addstr(buf, name);\n \tif (safe_create_leading_directories(buf->buf) ||\n-\t\t\t!(f = fopen(buf->buf, \"w\")) ||\n-\t\t\tfprintf(f, \"%s\\n\", sha1_to_hex(sha1)) < 0 ||\n-\t\t\tfclose(f))\n-\t\treturn error(\"problems writing temporary file %s\", buf->buf);\n+\t write_file(buf->buf, 0, \"%s\\n\", sha1_to_hex(sha1)))\n+\t\treturn error(\"problems writing temporary file %s: %s\",\n+\t\t\t buf->buf, strerror(errno));\n \tstrbuf_setlen(buf, len);\n \treturn 0;\n }\n-- \n1.8.5.2.240.g8478abd\n"},{"id":"234983","messageId":"1392730814-19656-22-git-send-email-pclouds@gmail.com","threadId":"35908","inReplyTo":"1392730814-19656-1-git-send-email-pclouds@gmail.com","subject":"[PATCH v3 21/25] checkout: support checking out into a new working directory","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2014-02-18T13:40:10Z","receivedAt":"2014-02-18T13:40:10Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"\"git checkout --to\" sets up a new working directory with a .git file\npointing to $GIT_DIR/repos/. It then executes \"git checkout\" again\non the new worktree with the same arguments except \"--to\" is taken\nout. The second checkout execution, which is not contaminated with any\ninfo from the current repository, will actually check out and\neverything that normal \"git checkout\" does.\n\nSigned-off-by: Nguyễn Thái Ngọc Duy \n---\n Documentation/git-checkout.txt | 34 +++++++++++++\n Documentation/gitrepository-layout.txt | 3 ++\n builtin/checkout.c | 93 +++++++++++++++++++++++++++++++++-\n t/t2025-checkout-to.sh (new +x) | 39 ++++++++++++++\n 4 files changed, 167 insertions(+), 2 deletions(-)\n create mode 100755 t/t2025-checkout-to.sh\n\ndiff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt\nindex 33ad2ad..fcf73b2 100644\n--- a/Documentation/git-checkout.txt\n+++ b/Documentation/git-checkout.txt\n@@ -225,6 +225,13 @@ This means that you can use `git checkout -p` to selectively discard\n edits from your current working tree. See the ``Interactive Mode''\n section of linkgit:git-add[1] to learn how to operate the `--patch` mode.\n \n+--to=::\n+\tCheck out a new branch in a separate working directory at\n+\t``. A new working directory is linked to the current\n+\trepository, sharing everything except working directory\n+\tspecific files such as HEAD, index... See \"MULTIPLE CHECKOUT\n+\tMODE\" section for more information.\n+\n ::\n \tBranch to checkout; if it refers to a branch (i.e., a name that,\n \twhen prepended with \"refs/heads/\", is a valid ref), then that\n@@ -388,6 +395,33 @@ $ git reflog -2 HEAD # or\n $ git log -g -2 HEAD\n ------------\n \n+MULTIPLE CHECKOUT MODE\n+-------------------------------\n+Normally a working directory is attached to repository. When \"git\n+checkout --to\" is used, a new working directory is attached to the\n+current repository. This new working directory is called \"linked\n+checkout\" as compared to the \"main checkout\" prepared by \"git init\" or\n+\"git clone\". A repository has one main checkout and zero or more\n+linked checkouts.\n+\n+All checkouts share the same repository. Linked checkouts see the\n+repository a bit different from the main checkout. When the checkout\n+\"new\" reads the path $GIT_DIR/HEAD for example, the actual path\n+returned could be $GIT_DIR/repos/new/HEAD. This ensures checkouts\n+won't step on each other.\n+\n+Each linked checkout has a private space in $GIT_DIR/repos, usually\n+named after the base name of the working directory with a number added\n+to make it unique. The linked checkout's $GIT_DIR points to this\n+private space while $GIT_COMMON_DIR points to the main checkout's\n+$GIT_DIR. These settings are done by \"git checkout --to\".\n+\n+Because in this mode $GIT_DIR becomes a lightweight virtual file\n+system where a path could be rewritten to some place else, accessing\n+$GIT_DIR from scripts should use `git rev-parse --git-path` to resolve\n+a path instead of using it directly unless the path is known to be\n+private to the working directory.\n+\n EXAMPLES\n --------\n \ndiff --git a/Documentation/gitrepository-layout.txt b/Documentation/gitrepository-layout.txt\nindex 9bfe0f1..495a937 100644\n--- a/Documentation/gitrepository-layout.txt\n+++ b/Documentation/gitrepository-layout.txt\n@@ -218,6 +218,9 @@ commondir::\n modules::\n \tContains the git-repositories of the submodules.\n \n+repos::\n+\tContains worktree specific information of linked checkouts.\n+\n SEE ALSO\n --------\n linkgit:git-init[1],\ndiff --git a/builtin/checkout.c b/builtin/checkout.c\nindex 0570e41..2b856a6 100644\n--- a/builtin/checkout.c\n+++ b/builtin/checkout.c\n@@ -48,6 +48,10 @@ struct checkout_opts {\n \tconst char *prefix;\n \tstruct pathspec pathspec;\n \tstruct tree *source_tree;\n+\n+\tconst char *new_worktree;\n+\tconst char **saved_argv;\n+\tint new_worktree_mode;\n };\n \n static int post_checkout_hook(struct commit *old, struct commit *new,\n@@ -250,6 +254,9 @@ static int checkout_paths(const struct checkout_opts *opts,\n \t\tdie(_(\"Cannot update paths and switch to branch '%s' at the same time.\"),\n \t\t opts->new_branch);\n \n+\tif (opts->new_worktree)\n+\t\tdie(_(\"'%s' cannot be used with updating paths\"), \"--to\");\n+\n \tif (opts->patch_mode)\n \t\treturn run_add_interactive(revision, \"--patch=checkout\",\n \t\t\t\t\t &opts->pathspec);\n@@ -486,7 +493,7 @@ static int merge_working_tree(const struct checkout_opts *opts,\n \t\t\ttopts.dir->flags |= DIR_SHOW_IGNORED;\n \t\t\tsetup_standard_excludes(topts.dir);\n \t\t}\n-\t\ttree = parse_tree_indirect(old->commit ?\n+\t\ttree = parse_tree_indirect(old->commit && !opts->new_worktree_mode ?\n \t\t\t\t\t old->commit->object.sha1 :\n \t\t\t\t\t EMPTY_TREE_SHA1_BIN);\n \t\tinit_tree_desc(&trees[0], tree->buffer, tree->size);\n@@ -796,7 +803,8 @@ static int switch_branches(const struct checkout_opts *opts,\n \t\treturn ret;\n \t}\n \n-\tif (!opts->quiet && !old.path && old.commit && new->commit != old.commit)\n+\tif (!opts->quiet && !old.path && old.commit &&\n+\t new->commit != old.commit && !opts->new_worktree_mode)\n \t\torphaned_commit_warning(old.commit, new->commit);\n \n \tupdate_refs_for_switch(opts, &old, new);\n@@ -806,6 +814,74 @@ static int switch_branches(const struct checkout_opts *opts,\n \treturn ret || writeout_error;\n }\n \n+static int prepare_linked_checkout(const struct checkout_opts *opts,\n+\t\t\t\t struct branch_info *new)\n+{\n+\tstruct strbuf sb_git = STRBUF_INIT, sb_repo = STRBUF_INIT;\n+\tstruct strbuf sb = STRBUF_INIT;\n+\tconst char *path = opts->new_worktree;\n+\tstruct stat st;\n+\tconst char *name;\n+\tstruct child_process cp;\n+\tint counter = 0, len;\n+\n+\tif (!new->commit)\n+\t\tdie(_(\"no branch specified\"));\n+\n+\tlen = strlen(path);\n+\tif (!len || is_dir_sep(path[len - 1]))\n+\t\tdie(_(\"'--to' argument '%s' cannot end with a slash\"), path);\n+\n+\tfor (name = path + len - 1; name > path; name--)\n+\t\tif (is_dir_sep(*name)) {\n+\t\t\tname++;\n+\t\t\tbreak;\n+\t\t}\n+\tstrbuf_addstr(&sb_repo, git_path(\"repos/%s\", name));\n+\tlen = sb_repo.len;\n+\tif (safe_create_leading_directories_const(sb_repo.buf))\n+\t\tdie_errno(_(\"could not create leading directories of '%s'\"),\n+\t\t\t sb_repo.buf);\n+\twhile (!stat(sb_repo.buf, &st)) {\n+\t\tcounter++;\n+\t\tstrbuf_setlen(&sb_repo, len);\n+\t\tstrbuf_addf(&sb_repo, \"%d\", counter);\n+\t}\n+\tname = sb_repo.buf + len - strlen(name);\n+\tif (mkdir(sb_repo.buf, 0777))\n+\t\tdie_errno(_(\"could not create directory of '%s'\"), sb_repo.buf);\n+\n+\tstrbuf_addf(&sb_git, \"%s/.git\", path);\n+\tif (safe_create_leading_directories_const(sb_git.buf))\n+\t\tdie_errno(_(\"could not create leading directories of '%s'\"),\n+\t\t\t sb_git.buf);\n+\n+\twrite_file(sb_git.buf, 1, \"gitdir: %s/repos/%s\\n\",\n+\t\t real_path(get_git_dir()), name);\n+\t/*\n+\t * This is to keep resolve_ref() happy. We need a valid HEAD\n+\t * or is_git_directory() will reject the directory. Any valid\n+\t * value would do because this value will be ignored and\n+\t * replaced at the next (real) checkout.\n+\t */\n+\tstrbuf_addf(&sb, \"%s/HEAD\", sb_repo.buf);\n+\twrite_file(sb.buf, 1, \"%s\\n\", sha1_to_hex(new->commit->object.sha1));\n+\tstrbuf_reset(&sb);\n+\tstrbuf_addf(&sb, \"%s/commondir\", sb_repo.buf);\n+\twrite_file(sb.buf, 1, \"../..\\n\");\n+\n+\tif (!opts->quiet)\n+\t\tfprintf_ln(stderr, _(\"Enter %s (identifier %s)\"), path, name);\n+\n+\tsetenv(\"GIT_CHECKOUT_NEW_WORKTREE\", \"1\", 1);\n+\tsetenv(GIT_DIR_ENVIRONMENT, sb_git.buf, 1);\n+\tsetenv(GIT_WORK_TREE_ENVIRONMENT, path, 1);\n+\tmemset(&cp, 0, sizeof(cp));\n+\tcp.git_cmd = 1;\n+\tcp.argv = opts->saved_argv;\n+\treturn run_command(&cp);\n+}\n+\n static int git_checkout_config(const char *var, const char *value, void *cb)\n {\n \tif (!strcmp(var, \"diff.ignoresubmodules\")) {\n@@ -1067,6 +1143,9 @@ static int checkout_branch(struct checkout_opts *opts,\n \t\tdie(_(\"Cannot switch branch to a non-commit '%s'\"),\n \t\t new->name);\n \n+\tif (opts->new_worktree)\n+\t\treturn prepare_linked_checkout(opts, new);\n+\n \tif (!new->commit && opts->new_branch) {\n \t\tunsigned char rev[20];\n \t\tint flag;\n@@ -1109,6 +1188,8 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)\n \t\t\t N_(\"do not limit pathspecs to sparse entries only\")),\n \t\tOPT_HIDDEN_BOOL(0, \"guess\", &dwim_new_local_branch,\n \t\t\t\tN_(\"second guess 'git checkout no-such-branch'\")),\n+\t\tOPT_STRING(0, \"to\", &opts.new_worktree, N_(\"path\"),\n+\t\t\t N_(\"check a branch out in a separate working directory\")),\n \t\tOPT_END(),\n \t};\n \n@@ -1117,6 +1198,9 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)\n \topts.overwrite_ignore = 1;\n \topts.prefix = prefix;\n \n+\topts.saved_argv = xmalloc(sizeof(const char *) * (argc + 2));\n+\tmemcpy(opts.saved_argv, argv, sizeof(const char *) * (argc + 1));\n+\n \tgitmodules_config();\n \tgit_config(git_checkout_config, &opts);\n \n@@ -1125,6 +1209,11 @@ int cmd_checkout(int argc, const char **argv, const char *prefix)\n \targc = parse_options(argc, argv, prefix, options, checkout_usage,\n \t\t\t PARSE_OPT_KEEP_DASHDASH);\n \n+\t/* recursive execution from checkout_new_worktree() */\n+\topts.new_worktree_mode = getenv(\"GIT_CHECKOUT_NEW_WORKTREE\") != NULL;\n+\tif (opts.new_worktree_mode)\n+\t\topts.new_worktree = NULL;\n+\n \tif (conflict_style) {\n \t\topts.merge = 1; /* implied */\n \t\tgit_xmerge_config(\"merge.conflictstyle\", conflict_style, NULL);\ndiff --git a/t/t2025-checkout-to.sh b/t/t2025-checkout-to.sh\nnew file mode 100755\nindex 0000000..76eae4a\n--- /dev/null\n+++ b/t/t2025-checkout-to.sh\n@@ -0,0 +1,39 @@\n+#!/bin/sh\n+\n+test_description='test git checkout --to'\n+\n+. ./test-lib.sh\n+\n+test_expect_success 'setup' '\n+\ttest_commit init\n+'\n+\n+test_expect_success 'checkout --to not updating paths' '\n+\ttest_must_fail git checkout --to -- init.t\n+'\n+\n+test_expect_success 'checkout --to a new worktree' '\n+\tgit checkout --to here master &&\n+\t(\n+\t\tcd here &&\n+\t\ttest_cmp ../init.t init.t &&\n+\t\tgit symbolic-ref HEAD >actual &&\n+\t\techo refs/heads/master >expect &&\n+\t\ttest_cmp expect actual &&\n+\t\tgit fsck\n+\t)\n+'\n+\n+test_expect_success 'checkout --to a new worktree creating new branch' '\n+\tgit checkout --to there -b newmaster master &&\n+\t(\n+\t\tcd there &&\n+\t\ttest_cmp ../init.t init.t &&\n+\t\tgit symbolic-ref HEAD >actual &&\n+\t\techo refs/heads/newmaster >expect &&\n+\t\ttest_cmp expect actual &&\n+\t\tgit fsck\n+\t)\n+'\n+\n+test_done\n-- \n1.8.5.2.240.g8478abd\n"},{"id":"234984","messageId":"1392730814-19656-23-git-send-email-pclouds@gmail.com","threadId":"35908","inReplyTo":"1392730814-19656-1-git-send-email-pclouds@gmail.com","subject":"[PATCH v3 22/25] checkout: clean up half-prepared directories in --to mode","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2014-02-18T13:40:11Z","receivedAt":"2014-02-18T13:40:11Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"Signed-off-by: Nguyễn Thái Ngọc Duy \n---\n builtin/checkout.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++--\n 1 file changed, 47 insertions(+), 2 deletions(-)\n\ndiff --git a/builtin/checkout.c b/builtin/checkout.c\nindex 2b856a6..f961604 100644\n--- a/builtin/checkout.c\n+++ b/builtin/checkout.c\n@@ -20,6 +20,7 @@\n #include \"resolve-undo.h\"\n #include \"submodule.h\"\n #include \"argv-array.h\"\n+#include \"sigchain.h\"\n \n static const char * const checkout_usage[] = {\n \tN_(\"git checkout [options] \"),\n@@ -814,6 +815,35 @@ static int switch_branches(const struct checkout_opts *opts,\n \treturn ret || writeout_error;\n }\n \n+static const char *junk_work_tree;\n+static const char *junk_git_dir;\n+static int is_junk;\n+static pid_t junk_pid;\n+\n+static void remove_junk(void)\n+{\n+\tstruct strbuf sb = STRBUF_INIT;\n+\tif (!is_junk || getpid() != junk_pid)\n+\t\treturn;\n+\tif (junk_git_dir) {\n+\t\tstrbuf_addstr(&sb, junk_git_dir);\n+\t\tremove_dir_recursively(&sb, 0);\n+\t\tstrbuf_reset(&sb);\n+\t}\n+\tif (junk_work_tree) {\n+\t\tstrbuf_addstr(&sb, junk_work_tree);\n+\t\tremove_dir_recursively(&sb, 0);\n+\t\tstrbuf_reset(&sb);\n+\t}\n+}\n+\n+static void remove_junk_on_signal(int signo)\n+{\n+\tremove_junk();\n+\tsigchain_pop(signo);\n+\traise(signo);\n+}\n+\n static int prepare_linked_checkout(const struct checkout_opts *opts,\n \t\t\t\t struct branch_info *new)\n {\n@@ -823,7 +853,7 @@ static int prepare_linked_checkout(const struct checkout_opts *opts,\n \tstruct stat st;\n \tconst char *name;\n \tstruct child_process cp;\n-\tint counter = 0, len;\n+\tint counter = 0, len, ret;\n \n \tif (!new->commit)\n \t\tdie(_(\"no branch specified\"));\n@@ -848,13 +878,21 @@ static int prepare_linked_checkout(const struct checkout_opts *opts,\n \t\tstrbuf_addf(&sb_repo, \"%d\", counter);\n \t}\n \tname = sb_repo.buf + len - strlen(name);\n+\n+\tjunk_pid = getpid();\n+\tatexit(remove_junk);\n+\tsigchain_push_common(remove_junk_on_signal);\n+\n \tif (mkdir(sb_repo.buf, 0777))\n \t\tdie_errno(_(\"could not create directory of '%s'\"), sb_repo.buf);\n+\tjunk_git_dir = sb_repo.buf;\n+\tis_junk = 1;\n \n \tstrbuf_addf(&sb_git, \"%s/.git\", path);\n \tif (safe_create_leading_directories_const(sb_git.buf))\n \t\tdie_errno(_(\"could not create leading directories of '%s'\"),\n \t\t\t sb_git.buf);\n+\tjunk_work_tree = path;\n \n \twrite_file(sb_git.buf, 1, \"gitdir: %s/repos/%s\\n\",\n \t\t real_path(get_git_dir()), name);\n@@ -879,7 +917,14 @@ static int prepare_linked_checkout(const struct checkout_opts *opts,\n \tmemset(&cp, 0, sizeof(cp));\n \tcp.git_cmd = 1;\n \tcp.argv = opts->saved_argv;\n-\treturn run_command(&cp);\n+\tret = run_command(&cp);\n+\tif (!ret)\n+\t\tis_junk = 0;\n+\tstrbuf_release(&sb);\n+\tstrbuf_release(&sb_repo);\n+\tstrbuf_release(&sb_git);\n+\treturn ret;\n+\n }\n \n static int git_checkout_config(const char *var, const char *value, void *cb)\n-- \n1.8.5.2.240.g8478abd\n"},{"id":"234989","messageId":"1392730814-19656-24-git-send-email-pclouds@gmail.com","threadId":"35908","inReplyTo":"1392730814-19656-1-git-send-email-pclouds@gmail.com","subject":"[PATCH v3 23/25] checkout: detach if the branch is already checked out elsewhere","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2014-02-18T13:40:12Z","receivedAt":"2014-02-18T13:40:12Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"The normal rule is anything outside refs/heads/ is detached. This\nstrictens the rule a bit more: if the branch is checked out (either in\n$GIT_COMMON_DIR/HEAD or any $GIT_DIR/repos/.../HEAD) then it's\ndetached as well.\n\nA hint is given so the user knows where to go and do something there\nif they still want to checkout undetached here.\n\nSigned-off-by: Nguyễn Thái Ngọc Duy \n---\n builtin/checkout.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++\n t/t2025-checkout-to.sh | 15 ++++++++--\n 2 files changed, 90 insertions(+), 3 deletions(-)\n\ndiff --git a/builtin/checkout.c b/builtin/checkout.c\nindex f961604..7b86f2b 100644\n--- a/builtin/checkout.c\n+++ b/builtin/checkout.c\n@@ -433,6 +433,11 @@ struct branch_info {\n \tconst char *name; /* The short name used */\n \tconst char *path; /* The full name of a real branch */\n \tstruct commit *commit; /* The named commit */\n+\t/*\n+\t * if not null the branch is detached because it's alrady\n+\t * checked out in this checkout\n+\t */\n+\tchar *checkout;\n };\n \n static void setup_branch_path(struct branch_info *branch)\n@@ -640,6 +645,11 @@ static void update_refs_for_switch(const struct checkout_opts *opts,\n \t\t\tif (old->path && advice_detached_head)\n \t\t\t\tdetach_advice(new->name);\n \t\t\tdescribe_detached_head(_(\"HEAD is now at\"), new->commit);\n+\t\t\tif (new->checkout && !*new->checkout)\n+\t\t\t\tfprintf(stderr, _(\"hint: the main checkout is holding this branch\\n\"));\n+\t\t\telse if (new->checkout)\n+\t\t\t\tfprintf(stderr, _(\"hint: the linked checkout %s is holding this branch\\n\"),\n+\t\t\t\t\tnew->checkout);\n \t\t}\n \t} else if (new->path) {\t/* Switch branches. */\n \t\tcreate_symref(\"HEAD\", new->path, msg.buf);\n@@ -982,6 +992,71 @@ static const char *unique_tracking_name(const char *name, unsigned char *sha1)\n \treturn NULL;\n }\n \n+static int check_linked_checkout(struct branch_info *new,\n+\t\t\t\t const char *name, const char *path)\n+{\n+\tstruct strbuf sb = STRBUF_INIT;\n+\tchar *start, *end;\n+\tif (strbuf_read_file(&sb, path, 0) < 0)\n+\t\treturn 0;\n+\tif (!starts_with(sb.buf, \"ref:\")) {\n+\t\tstrbuf_release(&sb);\n+\t\treturn 0;\n+\t}\n+\n+\tstart = sb.buf + 4;\n+\twhile (isspace(*start))\n+\t\tstart++;\n+\tend = start;\n+\twhile (*end && !isspace(*end))\n+\t\tend++;\n+\tif (!strncmp(start, new->path, end - start) &&\n+\t new->path[end - start] == '\\0') {\n+\t\tstrbuf_release(&sb);\n+\t\tnew->path = NULL; /* detach */\n+\t\tnew->checkout = xstrdup(name); /* reason */\n+\t\treturn 1;\n+\t}\n+\tstrbuf_release(&sb);\n+\treturn 0;\n+}\n+\n+static void check_linked_checkouts(struct branch_info *new)\n+{\n+\tstruct strbuf path = STRBUF_INIT;\n+\tDIR *dir;\n+\tstruct dirent *d;\n+\n+\tstrbuf_addf(&path, \"%s/repos\", get_git_common_dir());\n+\tif ((dir = opendir(path.buf)) == NULL)\n+\t\treturn;\n+\n+\tstrbuf_reset(&path);\n+\tstrbuf_addf(&path, \"%s/HEAD\", get_git_common_dir());\n+\t/*\n+\t * $GIT_COMMON_DIR/HEAD is practically outside\n+\t * $GIT_DIR so resolve_ref_unsafe() won't work (it\n+\t * uses git_path). Parse the ref ourselves.\n+\t */\n+\tif (check_linked_checkout(new, \"\", path.buf)) {\n+\t\tstrbuf_release(&path);\n+\t\tclosedir(dir);\n+\t\treturn;\n+\t}\n+\n+\twhile ((d = readdir(dir)) != NULL) {\n+\t\tif (!strcmp(d->d_name, \".\") || !strcmp(d->d_name, \"..\"))\n+\t\t\tcontinue;\n+\t\tstrbuf_reset(&path);\n+\t\tstrbuf_addf(&path, \"%s/repos/%s/HEAD\",\n+\t\t\t get_git_common_dir(), d->d_name);\n+\t\tif (check_linked_checkout(new, d->d_name, path.buf))\n+\t\t\tbreak;\n+\t}\n+\tstrbuf_release(&path);\n+\tclosedir(dir);\n+}\n+\n static int parse_branchname_arg(int argc, const char **argv,\n \t\t\t\tint dwim_new_local_branch_ok,\n \t\t\t\tstruct branch_info *new,\n@@ -1109,6 +1184,9 @@ static int parse_branchname_arg(int argc, const char **argv,\n \telse\n \t\tnew->path = NULL; /* not an existing branch */\n \n+\tif (new->path)\n+\t\tcheck_linked_checkouts(new);\n+\n \tnew->commit = lookup_commit_reference_gently(rev, 1);\n \tif (!new->commit) {\n \t\t/* not a commit */\ndiff --git a/t/t2025-checkout-to.sh b/t/t2025-checkout-to.sh\nindex 76eae4a..f6a5c47 100755\n--- a/t/t2025-checkout-to.sh\n+++ b/t/t2025-checkout-to.sh\n@@ -13,13 +13,14 @@ test_expect_success 'checkout --to not updating paths' '\n '\n \n test_expect_success 'checkout --to a new worktree' '\n+\tgit rev-parse HEAD >expect &&\n \tgit checkout --to here master &&\n \t(\n \t\tcd here &&\n \t\ttest_cmp ../init.t init.t &&\n-\t\tgit symbolic-ref HEAD >actual &&\n-\t\techo refs/heads/master >expect &&\n-\t\ttest_cmp expect actual &&\n+\t\t! git symbolic-ref HEAD &&\n+\t\tgit rev-parse HEAD >actual &&\n+\t\ttest_cmp ../expect actual &&\n \t\tgit fsck\n \t)\n '\n@@ -36,4 +37,12 @@ test_expect_success 'checkout --to a new worktree creating new branch' '\n \t)\n '\n \n+test_expect_success 'detach if the same branch is already checked out' '\n+\t(\n+\t\tcd here &&\n+\t\tgit checkout newmaster &&\n+\t\ttest_must_fail git symbolic-ref HEAD\n+\t)\n+'\n+\n test_done\n-- \n1.8.5.2.240.g8478abd\n"},{"id":"234990","messageId":"1392730814-19656-25-git-send-email-pclouds@gmail.com","threadId":"35908","inReplyTo":"1392730814-19656-1-git-send-email-pclouds@gmail.com","subject":"[PATCH v3 24/25] prune: strategies for linked checkouts","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2014-02-18T13:40:13Z","receivedAt":"2014-02-18T13:40:13Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"alias REPO=$GIT_COMMON_DIR/repos/\n\n - linked checkouts are supposed to update mtime of $REPO/gitdir\n\n - linked checkouts are supposed to keep its location in $REPO/gitdir up to\n date\n\n - \"git checkout --to\" is supposed to create $REPO/locked if the new\n repo is on a different partition than the shared one.\n\n - \"git checkout --to\" is supposed to make hardlink named $REPO/link\n pointing to the .git file\n\nThe pruning rules are:\n\n - if $REPO/locked exists, repos/ is not supposed to be pruned.\n\n - if $REPO/locked exists and $REPO/gitdir's mtimer is older than a\n really long limit, warn about old unused repo.\n\n - if $REPO/link exists and its link count is greated than 1, the repo\n is kept.\n\n - if $REPO/gitdir's mtime is older than a limit, and it points to\n nowhere, repos/ is to be pruned.\n\nSigned-off-by: Nguyễn Thái Ngọc Duy \n---\n Documentation/git-prune.txt | 3 ++\n Documentation/gitrepository-layout.txt | 19 +++++++++\n builtin/checkout.c | 36 +++++++++++++++-\n builtin/prune.c | 75 ++++++++++++++++++++++++++++++++++\n setup.c | 13 ++++++\n 5 files changed, 145 insertions(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-prune.txt b/Documentation/git-prune.txt\nindex 058ac0d..7babf11 100644\n--- a/Documentation/git-prune.txt\n+++ b/Documentation/git-prune.txt\n@@ -48,6 +48,9 @@ OPTIONS\n --expire