summaryrefslogtreecommitdiff
path: root/builtin/rev-parse.c
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2014-11-30 08:24:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-12-01 19:00:15 (GMT)
commit31e26ebcb512ad234d9725120fb4f5670ff75625 (patch)
tree065370d0f48d3a715c888e2ee4bf796c45a11f16 /builtin/rev-parse.c
parente61a509a497520550b5b84b753a95549158f9f1c (diff)
downloadgit-31e26ebcb512ad234d9725120fb4f5670ff75625.zip
git-31e26ebcb512ad234d9725120fb4f5670ff75625.tar.gz
git-31e26ebcb512ad234d9725120fb4f5670ff75625.tar.bz2
setup.c: support multi-checkout repo setup
The repo setup procedure is updated to detect $GIT_DIR/commondir and set $GIT_COMMON_DIR properly. The core.worktree is ignored when $GIT_COMMON_DIR is set. This is because the config file is shared in multi-checkout setup, but checkout directories _are_ different. Making core.worktree effective in all checkouts mean it's back to a single checkout. Helped-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/rev-parse.c')
-rw-r--r--builtin/rev-parse.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
index 4cd44aa..5799f35 100644
--- a/builtin/rev-parse.c
+++ b/builtin/rev-parse.c
@@ -762,6 +762,10 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
free(cwd);
continue;
}
+ if (!strcmp(arg, "--git-common-dir")) {
+ puts(get_git_common_dir());
+ continue;
+ }
if (!strcmp(arg, "--resolve-git-dir")) {
const char *gitdir = argv[++i];
if (!gitdir)