2008-05-20 08:48:54 +02:00
|
|
|
#!/bin/sh
|
|
|
|
|
#
|
|
|
|
|
# Copyright (c) 2008 David Reiss
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
test_description='Test various path utilities'
|
|
|
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
2009-03-11 22:15:10 +01:00
|
|
|
norm_path() {
|
2013-10-10 22:49:43 +02:00
|
|
|
expected=$(test-path-utils print_path "$2")
|
2009-03-11 22:15:10 +01:00
|
|
|
test_expect_success $3 "normalize path: $1 => $2" \
|
2013-06-25 17:53:57 +02:00
|
|
|
"test \"\$(test-path-utils normalize_path_copy '$1')\" = '$expected'"
|
2008-05-20 08:48:54 +02:00
|
|
|
}
|
|
|
|
|
|
2013-06-25 17:53:42 +02:00
|
|
|
relative_path() {
|
2013-10-10 22:49:43 +02:00
|
|
|
expected=$(test-path-utils print_path "$3")
|
2013-06-25 17:53:42 +02:00
|
|
|
test_expect_success $4 "relative path: $1 $2 => $3" \
|
2013-06-25 17:53:57 +02:00
|
|
|
"test \"\$(test-path-utils relative_path '$1' '$2')\" = '$expected'"
|
2013-06-25 17:53:42 +02:00
|
|
|
}
|
|
|
|
|
|
2014-11-30 09:24:31 +01:00
|
|
|
test_git_path() {
|
|
|
|
|
test_expect_success "git-path $1 $2 => $3" "
|
|
|
|
|
$1 git rev-parse --git-path $2 >actual &&
|
|
|
|
|
echo $3 >expect &&
|
|
|
|
|
test_cmp expect actual
|
|
|
|
|
"
|
|
|
|
|
}
|
|
|
|
|
|
2009-03-11 22:15:10 +01:00
|
|
|
# On Windows, we are using MSYS's bash, which mangles the paths.
|
|
|
|
|
# Absolute paths are anchored at the MSYS installation directory,
|
|
|
|
|
# which means that the path / accounts for this many characters:
|
|
|
|
|
rootoff=$(test-path-utils normalize_path_copy / | wc -c)
|
|
|
|
|
# Account for the trailing LF:
|
2009-03-23 07:22:29 +01:00
|
|
|
if test $rootoff = 2; then
|
2009-03-11 22:15:10 +01:00
|
|
|
rootoff= # we are on Unix
|
|
|
|
|
else
|
|
|
|
|
rootoff=$(($rootoff-1))
|
|
|
|
|
fi
|
|
|
|
|
|
2008-05-20 08:49:26 +02:00
|
|
|
ancestor() {
|
2009-03-11 22:15:10 +01:00
|
|
|
# We do some math with the expected ancestor length.
|
|
|
|
|
expected=$3
|
|
|
|
|
if test -n "$rootoff" && test "x$expected" != x-1; then
|
|
|
|
|
expected=$(($expected+$rootoff))
|
|
|
|
|
fi
|
|
|
|
|
test_expect_success "longest ancestor: $1 $2 => $expected" \
|
|
|
|
|
"actual=\$(test-path-utils longest_ancestor_length '$1' '$2') &&
|
|
|
|
|
test \"\$actual\" = '$expected'"
|
2008-05-20 08:49:26 +02:00
|
|
|
}
|
|
|
|
|
|
2013-06-25 17:53:57 +02:00
|
|
|
# Some absolute path tests should be skipped on Windows due to path mangling
|
|
|
|
|
# on POSIX-style absolute paths
|
2009-03-11 22:15:10 +01:00
|
|
|
case $(uname -s) in
|
|
|
|
|
*MINGW*)
|
|
|
|
|
;;
|
|
|
|
|
*)
|
|
|
|
|
test_set_prereq POSIX
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
|
2016-01-12 08:57:57 +01:00
|
|
|
test_expect_success basename 'test-path-utils basename'
|
|
|
|
|
test_expect_success dirname 'test-path-utils dirname'
|
|
|
|
|
|
2009-03-11 22:15:10 +01:00
|
|
|
norm_path "" ""
|
|
|
|
|
norm_path . ""
|
|
|
|
|
norm_path ./ ""
|
|
|
|
|
norm_path ./. ""
|
|
|
|
|
norm_path ./.. ++failed++
|
|
|
|
|
norm_path ../. ++failed++
|
|
|
|
|
norm_path ./../.// ++failed++
|
|
|
|
|
norm_path dir/.. ""
|
|
|
|
|
norm_path dir/sub/../.. ""
|
|
|
|
|
norm_path dir/sub/../../.. ++failed++
|
|
|
|
|
norm_path dir dir
|
|
|
|
|
norm_path dir// dir/
|
|
|
|
|
norm_path ./dir dir
|
|
|
|
|
norm_path dir/. dir/
|
|
|
|
|
norm_path dir///./ dir/
|
|
|
|
|
norm_path dir//sub/.. dir/
|
|
|
|
|
norm_path dir/sub/../ dir/
|
|
|
|
|
norm_path dir/sub/../. dir/
|
|
|
|
|
norm_path dir/s1/../s2/ dir/s2/
|
|
|
|
|
norm_path d1/s1///s2/..//../s3/ d1/s3/
|
|
|
|
|
norm_path d1/s1//../s2/../../d2 d2
|
|
|
|
|
norm_path d1/.../d2 d1/.../d2
|
|
|
|
|
norm_path d1/..././../d2 d1/d2
|
|
|
|
|
|
2013-06-25 17:53:57 +02:00
|
|
|
norm_path / /
|
2009-03-11 22:15:10 +01:00
|
|
|
norm_path // / POSIX
|
|
|
|
|
norm_path /// / POSIX
|
2013-06-25 17:53:57 +02:00
|
|
|
norm_path /. /
|
2009-03-11 22:15:10 +01:00
|
|
|
norm_path /./ / POSIX
|
|
|
|
|
norm_path /./.. ++failed++ POSIX
|
2013-06-25 17:53:57 +02:00
|
|
|
norm_path /../. ++failed++
|
2009-03-11 22:15:10 +01:00
|
|
|
norm_path /./../.// ++failed++ POSIX
|
|
|
|
|
norm_path /dir/.. / POSIX
|
|
|
|
|
norm_path /dir/sub/../.. / POSIX
|
|
|
|
|
norm_path /dir/sub/../../.. ++failed++ POSIX
|
2013-06-25 17:53:57 +02:00
|
|
|
norm_path /dir /dir
|
|
|
|
|
norm_path /dir// /dir/
|
|
|
|
|
norm_path /./dir /dir
|
|
|
|
|
norm_path /dir/. /dir/
|
|
|
|
|
norm_path /dir///./ /dir/
|
|
|
|
|
norm_path /dir//sub/.. /dir/
|
|
|
|
|
norm_path /dir/sub/../ /dir/
|
2009-03-11 22:15:10 +01:00
|
|
|
norm_path //dir/sub/../. /dir/ POSIX
|
2013-06-25 17:53:57 +02:00
|
|
|
norm_path /dir/s1/../s2/ /dir/s2/
|
|
|
|
|
norm_path /d1/s1///s2/..//../s3/ /d1/s3/
|
|
|
|
|
norm_path /d1/s1//../s2/../../d2 /d2
|
|
|
|
|
norm_path /d1/.../d2 /d1/.../d2
|
|
|
|
|
norm_path /d1/..././../d2 /d1/d2
|
2008-05-20 08:48:54 +02:00
|
|
|
|
2008-05-20 08:49:26 +02:00
|
|
|
ancestor / / -1
|
|
|
|
|
ancestor /foo / 0
|
|
|
|
|
ancestor /foo /fo -1
|
|
|
|
|
ancestor /foo /foo -1
|
|
|
|
|
ancestor /foo /bar -1
|
|
|
|
|
ancestor /foo /foo/bar -1
|
2012-10-28 17:16:25 +01:00
|
|
|
ancestor /foo /foo:/bar -1
|
|
|
|
|
ancestor /foo /:/foo:/bar 0
|
|
|
|
|
ancestor /foo /foo:/:/bar 0
|
|
|
|
|
ancestor /foo /:/bar:/foo 0
|
2008-05-20 08:49:26 +02:00
|
|
|
ancestor /foo/bar / 0
|
|
|
|
|
ancestor /foo/bar /fo -1
|
|
|
|
|
ancestor /foo/bar /foo 4
|
|
|
|
|
ancestor /foo/bar /foo/ba -1
|
|
|
|
|
ancestor /foo/bar /:/fo 0
|
|
|
|
|
ancestor /foo/bar /foo:/foo/ba 4
|
|
|
|
|
ancestor /foo/bar /bar -1
|
2012-10-28 17:16:25 +01:00
|
|
|
ancestor /foo/bar /fo -1
|
|
|
|
|
ancestor /foo/bar /foo:/bar 4
|
|
|
|
|
ancestor /foo/bar /:/foo:/bar 4
|
|
|
|
|
ancestor /foo/bar /foo:/:/bar 4
|
|
|
|
|
ancestor /foo/bar /:/bar:/fo 0
|
|
|
|
|
ancestor /foo/bar /:/bar 0
|
|
|
|
|
ancestor /foo/bar /foo 4
|
|
|
|
|
ancestor /foo/bar /foo:/bar 4
|
|
|
|
|
ancestor /foo/bar /bar -1
|
2008-05-20 08:49:26 +02:00
|
|
|
|
2009-02-19 20:10:49 +01:00
|
|
|
test_expect_success 'strip_path_suffix' '
|
|
|
|
|
test c:/msysgit = $(test-path-utils strip_path_suffix \
|
|
|
|
|
c:/msysgit/libexec//git-core libexec/git-core)
|
|
|
|
|
'
|
2012-09-07 00:40:57 +02:00
|
|
|
|
2012-09-07 00:40:59 +02:00
|
|
|
test_expect_success 'absolute path rejects the empty string' '
|
2012-09-07 00:40:58 +02:00
|
|
|
test_must_fail test-path-utils absolute_path ""
|
|
|
|
|
'
|
|
|
|
|
|
2012-09-07 00:41:01 +02:00
|
|
|
test_expect_success 'real path rejects the empty string' '
|
2012-09-07 00:41:00 +02:00
|
|
|
test_must_fail test-path-utils real_path ""
|
|
|
|
|
'
|
|
|
|
|
|
2012-09-09 17:42:20 +02:00
|
|
|
test_expect_success POSIX 'real path works on absolute paths 1' '
|
2012-09-07 00:41:02 +02:00
|
|
|
nopath="hopefully-absent-path" &&
|
|
|
|
|
test "/" = "$(test-path-utils real_path "/")" &&
|
2012-09-09 17:42:20 +02:00
|
|
|
test "/$nopath" = "$(test-path-utils real_path "/$nopath")"
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'real path works on absolute paths 2' '
|
|
|
|
|
nopath="hopefully-absent-path" &&
|
2012-09-07 00:41:02 +02:00
|
|
|
# Find an existing top-level directory for the remaining tests:
|
|
|
|
|
d=$(pwd -P | sed -e "s|^\([^/]*/[^/]*\)/.*|\1|") &&
|
|
|
|
|
test "$d" = "$(test-path-utils real_path "$d")" &&
|
|
|
|
|
test "$d/$nopath" = "$(test-path-utils real_path "$d/$nopath")"
|
|
|
|
|
'
|
|
|
|
|
|
2012-09-07 00:41:04 +02:00
|
|
|
test_expect_success POSIX 'real path removes extra leading slashes' '
|
|
|
|
|
nopath="hopefully-absent-path" &&
|
|
|
|
|
test "/" = "$(test-path-utils real_path "///")" &&
|
|
|
|
|
test "/$nopath" = "$(test-path-utils real_path "///$nopath")" &&
|
|
|
|
|
# Find an existing top-level directory for the remaining tests:
|
|
|
|
|
d=$(pwd -P | sed -e "s|^\([^/]*/[^/]*\)/.*|\1|") &&
|
|
|
|
|
test "$d" = "$(test-path-utils real_path "//$d")" &&
|
|
|
|
|
test "$d/$nopath" = "$(test-path-utils real_path "//$d/$nopath")"
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'real path removes other extra slashes' '
|
|
|
|
|
nopath="hopefully-absent-path" &&
|
|
|
|
|
# Find an existing top-level directory for the remaining tests:
|
|
|
|
|
d=$(pwd -P | sed -e "s|^\([^/]*/[^/]*\)/.*|\1|") &&
|
|
|
|
|
test "$d" = "$(test-path-utils real_path "$d///")" &&
|
|
|
|
|
test "$d/$nopath" = "$(test-path-utils real_path "$d///$nopath")"
|
|
|
|
|
'
|
|
|
|
|
|
2012-09-07 00:41:02 +02:00
|
|
|
test_expect_success SYMLINKS 'real path works on symlinks' '
|
2012-09-07 00:40:57 +02:00
|
|
|
mkdir first &&
|
|
|
|
|
ln -s ../.git first/.git &&
|
|
|
|
|
mkdir second &&
|
|
|
|
|
ln -s ../first second/other &&
|
|
|
|
|
mkdir third &&
|
|
|
|
|
dir="$(cd .git; pwd -P)" &&
|
|
|
|
|
dir2=third/../second/other/.git &&
|
|
|
|
|
test "$dir" = "$(test-path-utils real_path $dir2)" &&
|
|
|
|
|
file="$dir"/index &&
|
|
|
|
|
test "$file" = "$(test-path-utils real_path $dir2/index)" &&
|
|
|
|
|
basename=blub &&
|
|
|
|
|
test "$dir/$basename" = "$(cd .git && test-path-utils real_path "$basename")" &&
|
|
|
|
|
ln -s ../first/file .git/syml &&
|
|
|
|
|
sym="$(cd first; pwd -P)"/file &&
|
|
|
|
|
test "$sym" = "$(test-path-utils real_path "$dir2/syml")"
|
|
|
|
|
'
|
|
|
|
|
|
2014-02-04 15:25:20 +01:00
|
|
|
test_expect_success SYMLINKS 'prefix_path works with absolute paths to work tree symlinks' '
|
2014-02-04 15:25:16 +01:00
|
|
|
ln -s target symlink &&
|
|
|
|
|
test "$(test-path-utils prefix_path prefix "$(pwd)/symlink")" = "symlink"
|
|
|
|
|
'
|
|
|
|
|
|
2014-02-04 15:25:17 +01:00
|
|
|
test_expect_success 'prefix_path works with only absolute path to work tree' '
|
|
|
|
|
echo "" >expected &&
|
|
|
|
|
test-path-utils prefix_path prefix "$(pwd)" >actual &&
|
|
|
|
|
test_cmp expected actual
|
|
|
|
|
'
|
|
|
|
|
|
2014-02-04 15:25:18 +01:00
|
|
|
test_expect_success 'prefix_path rejects absolute path to dir with same beginning as work tree' '
|
|
|
|
|
test_must_fail test-path-utils prefix_path prefix "$(pwd)a"
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success SYMLINKS 'prefix_path works with absolute path to a symlink to work tree having same beginning as work tree' '
|
|
|
|
|
git init repo &&
|
|
|
|
|
ln -s repo repolink &&
|
|
|
|
|
test "a" = "$(cd repo && test-path-utils prefix_path prefix "$(pwd)/../repolink/a")"
|
|
|
|
|
'
|
|
|
|
|
|
2013-10-14 04:29:38 +02:00
|
|
|
relative_path /foo/a/b/c/ /foo/a/b/ c/
|
|
|
|
|
relative_path /foo/a/b/c/ /foo/a/b c/
|
|
|
|
|
relative_path /foo/a//b//c/ ///foo/a/b// c/ POSIX
|
|
|
|
|
relative_path /foo/a/b /foo/a/b ./
|
|
|
|
|
relative_path /foo/a/b/ /foo/a/b ./
|
|
|
|
|
relative_path /foo/a /foo/a/b ../
|
|
|
|
|
relative_path / /foo/a/b/ ../../../
|
|
|
|
|
relative_path /foo/a/c /foo/a/b/ ../c
|
|
|
|
|
relative_path /foo/a/c /foo/a/b ../c
|
|
|
|
|
relative_path /foo/x/y /foo/a/b/ ../../x/y
|
|
|
|
|
relative_path /foo/a/b "<empty>" /foo/a/b
|
|
|
|
|
relative_path /foo/a/b "<null>" /foo/a/b
|
|
|
|
|
relative_path foo/a/b/c/ foo/a/b/ c/
|
|
|
|
|
relative_path foo/a/b/c/ foo/a/b c/
|
|
|
|
|
relative_path foo/a/b//c foo/a//b c
|
|
|
|
|
relative_path foo/a/b/ foo/a/b/ ./
|
|
|
|
|
relative_path foo/a/b/ foo/a/b ./
|
|
|
|
|
relative_path foo/a foo/a/b ../
|
|
|
|
|
relative_path foo/x/y foo/a/b ../../x/y
|
|
|
|
|
relative_path foo/a/c foo/a/b ../c
|
2013-10-14 04:29:39 +02:00
|
|
|
relative_path foo/a/b /foo/x/y foo/a/b
|
|
|
|
|
relative_path /foo/a/b foo/x/y /foo/a/b
|
|
|
|
|
relative_path d:/a/b D:/a/c ../b MINGW
|
|
|
|
|
relative_path C:/a/b D:/a/c C:/a/b MINGW
|
2013-10-14 04:29:38 +02:00
|
|
|
relative_path foo/a/b "<empty>" foo/a/b
|
|
|
|
|
relative_path foo/a/b "<null>" foo/a/b
|
|
|
|
|
relative_path "<empty>" /foo/a/b ./
|
|
|
|
|
relative_path "<empty>" "<empty>" ./
|
|
|
|
|
relative_path "<empty>" "<null>" ./
|
|
|
|
|
relative_path "<null>" "<empty>" ./
|
|
|
|
|
relative_path "<null>" "<null>" ./
|
|
|
|
|
relative_path "<null>" /foo/a/b ./
|
2013-06-25 17:53:42 +02:00
|
|
|
|
2014-11-30 09:24:31 +01:00
|
|
|
test_git_path A=B info/grafts .git/info/grafts
|
|
|
|
|
test_git_path GIT_GRAFT_FILE=foo info/grafts foo
|
|
|
|
|
test_git_path GIT_GRAFT_FILE=foo info/////grafts foo
|
|
|
|
|
test_git_path GIT_INDEX_FILE=foo index foo
|
|
|
|
|
test_git_path GIT_INDEX_FILE=foo index/foo .git/index/foo
|
|
|
|
|
test_git_path GIT_INDEX_FILE=foo index2 .git/index2
|
|
|
|
|
test_expect_success 'setup fake objects directory foo' 'mkdir foo'
|
|
|
|
|
test_git_path GIT_OBJECT_DIRECTORY=foo objects foo
|
|
|
|
|
test_git_path GIT_OBJECT_DIRECTORY=foo objects/foo foo/foo
|
|
|
|
|
test_git_path GIT_OBJECT_DIRECTORY=foo objects2 .git/objects2
|
$GIT_COMMON_DIR: a new environment variable
This variable is intended to support multiple working directories
attached to a repository. Such a repository may have a main working
directory, created by either "git init" or "git clone" and one or more
linked working directories. These working directories and the main
repository share the same repository directory.
In linked working directories, $GIT_COMMON_DIR must be defined to point
to the real repository directory and $GIT_DIR points to an unused
subdirectory inside $GIT_COMMON_DIR. File locations inside the
repository are reorganized from the linked worktree view point:
- worktree-specific such as HEAD, logs/HEAD, index, other top-level
refs and unrecognized files are from $GIT_DIR.
- the rest like objects, refs, info, hooks, packed-refs, shallow...
are from $GIT_COMMON_DIR (except info/sparse-checkout, but that's
a separate patch)
Scripts are supposed to retrieve paths in $GIT_DIR with "git rev-parse
--git-path", which will take care of "$GIT_DIR vs $GIT_COMMON_DIR"
business.
The redirection is done by git_path(), git_pathdup() and
strbuf_git_path(). The selected list of paths goes to $GIT_COMMON_DIR,
not the other way around in case a developer adds a new
worktree-specific file and it's accidentally promoted to be shared
across repositories (this includes unknown files added by third party
commands)
The list of known files that belong to $GIT_DIR are:
ADD_EDIT.patch BISECT_ANCESTORS_OK BISECT_EXPECTED_REV BISECT_LOG
BISECT_NAMES CHERRY_PICK_HEAD COMMIT_MSG FETCH_HEAD HEAD MERGE_HEAD
MERGE_MODE MERGE_RR NOTES_EDITMSG NOTES_MERGE_WORKTREE ORIG_HEAD
REVERT_HEAD SQUASH_MSG TAG_EDITMSG fast_import_crash_* logs/HEAD
next-index-* rebase-apply rebase-merge rsync-refs-* sequencer/*
shallow_*
Path mapping is NOT done for git_path_submodule(). Multi-checkouts are
not supported as submodules.
Helped-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-11-30 09:24:36 +01:00
|
|
|
test_expect_success 'setup common repository' 'git --git-dir=bar init'
|
|
|
|
|
test_git_path GIT_COMMON_DIR=bar index .git/index
|
|
|
|
|
test_git_path GIT_COMMON_DIR=bar HEAD .git/HEAD
|
|
|
|
|
test_git_path GIT_COMMON_DIR=bar logs/HEAD .git/logs/HEAD
|
2015-09-01 04:13:11 +02:00
|
|
|
test_git_path GIT_COMMON_DIR=bar logs/refs/bisect/foo .git/logs/refs/bisect/foo
|
|
|
|
|
test_git_path GIT_COMMON_DIR=bar logs/refs/bisec/foo bar/logs/refs/bisec/foo
|
|
|
|
|
test_git_path GIT_COMMON_DIR=bar logs/refs/bisec bar/logs/refs/bisec
|
|
|
|
|
test_git_path GIT_COMMON_DIR=bar logs/refs/bisectfoo bar/logs/refs/bisectfoo
|
$GIT_COMMON_DIR: a new environment variable
This variable is intended to support multiple working directories
attached to a repository. Such a repository may have a main working
directory, created by either "git init" or "git clone" and one or more
linked working directories. These working directories and the main
repository share the same repository directory.
In linked working directories, $GIT_COMMON_DIR must be defined to point
to the real repository directory and $GIT_DIR points to an unused
subdirectory inside $GIT_COMMON_DIR. File locations inside the
repository are reorganized from the linked worktree view point:
- worktree-specific such as HEAD, logs/HEAD, index, other top-level
refs and unrecognized files are from $GIT_DIR.
- the rest like objects, refs, info, hooks, packed-refs, shallow...
are from $GIT_COMMON_DIR (except info/sparse-checkout, but that's
a separate patch)
Scripts are supposed to retrieve paths in $GIT_DIR with "git rev-parse
--git-path", which will take care of "$GIT_DIR vs $GIT_COMMON_DIR"
business.
The redirection is done by git_path(), git_pathdup() and
strbuf_git_path(). The selected list of paths goes to $GIT_COMMON_DIR,
not the other way around in case a developer adds a new
worktree-specific file and it's accidentally promoted to be shared
across repositories (this includes unknown files added by third party
commands)
The list of known files that belong to $GIT_DIR are:
ADD_EDIT.patch BISECT_ANCESTORS_OK BISECT_EXPECTED_REV BISECT_LOG
BISECT_NAMES CHERRY_PICK_HEAD COMMIT_MSG FETCH_HEAD HEAD MERGE_HEAD
MERGE_MODE MERGE_RR NOTES_EDITMSG NOTES_MERGE_WORKTREE ORIG_HEAD
REVERT_HEAD SQUASH_MSG TAG_EDITMSG fast_import_crash_* logs/HEAD
next-index-* rebase-apply rebase-merge rsync-refs-* sequencer/*
shallow_*
Path mapping is NOT done for git_path_submodule(). Multi-checkouts are
not supported as submodules.
Helped-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-11-30 09:24:36 +01:00
|
|
|
test_git_path GIT_COMMON_DIR=bar objects bar/objects
|
|
|
|
|
test_git_path GIT_COMMON_DIR=bar objects/bar bar/objects/bar
|
|
|
|
|
test_git_path GIT_COMMON_DIR=bar info/exclude bar/info/exclude
|
|
|
|
|
test_git_path GIT_COMMON_DIR=bar info/grafts bar/info/grafts
|
2014-11-30 09:24:55 +01:00
|
|
|
test_git_path GIT_COMMON_DIR=bar info/sparse-checkout .git/info/sparse-checkout
|
2015-09-01 04:13:10 +02:00
|
|
|
test_git_path GIT_COMMON_DIR=bar info//sparse-checkout .git/info//sparse-checkout
|
$GIT_COMMON_DIR: a new environment variable
This variable is intended to support multiple working directories
attached to a repository. Such a repository may have a main working
directory, created by either "git init" or "git clone" and one or more
linked working directories. These working directories and the main
repository share the same repository directory.
In linked working directories, $GIT_COMMON_DIR must be defined to point
to the real repository directory and $GIT_DIR points to an unused
subdirectory inside $GIT_COMMON_DIR. File locations inside the
repository are reorganized from the linked worktree view point:
- worktree-specific such as HEAD, logs/HEAD, index, other top-level
refs and unrecognized files are from $GIT_DIR.
- the rest like objects, refs, info, hooks, packed-refs, shallow...
are from $GIT_COMMON_DIR (except info/sparse-checkout, but that's
a separate patch)
Scripts are supposed to retrieve paths in $GIT_DIR with "git rev-parse
--git-path", which will take care of "$GIT_DIR vs $GIT_COMMON_DIR"
business.
The redirection is done by git_path(), git_pathdup() and
strbuf_git_path(). The selected list of paths goes to $GIT_COMMON_DIR,
not the other way around in case a developer adds a new
worktree-specific file and it's accidentally promoted to be shared
across repositories (this includes unknown files added by third party
commands)
The list of known files that belong to $GIT_DIR are:
ADD_EDIT.patch BISECT_ANCESTORS_OK BISECT_EXPECTED_REV BISECT_LOG
BISECT_NAMES CHERRY_PICK_HEAD COMMIT_MSG FETCH_HEAD HEAD MERGE_HEAD
MERGE_MODE MERGE_RR NOTES_EDITMSG NOTES_MERGE_WORKTREE ORIG_HEAD
REVERT_HEAD SQUASH_MSG TAG_EDITMSG fast_import_crash_* logs/HEAD
next-index-* rebase-apply rebase-merge rsync-refs-* sequencer/*
shallow_*
Path mapping is NOT done for git_path_submodule(). Multi-checkouts are
not supported as submodules.
Helped-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-11-30 09:24:36 +01:00
|
|
|
test_git_path GIT_COMMON_DIR=bar remotes/bar bar/remotes/bar
|
|
|
|
|
test_git_path GIT_COMMON_DIR=bar branches/bar bar/branches/bar
|
|
|
|
|
test_git_path GIT_COMMON_DIR=bar logs/refs/heads/master bar/logs/refs/heads/master
|
|
|
|
|
test_git_path GIT_COMMON_DIR=bar refs/heads/master bar/refs/heads/master
|
2015-09-01 04:13:11 +02:00
|
|
|
test_git_path GIT_COMMON_DIR=bar refs/bisect/foo .git/refs/bisect/foo
|
$GIT_COMMON_DIR: a new environment variable
This variable is intended to support multiple working directories
attached to a repository. Such a repository may have a main working
directory, created by either "git init" or "git clone" and one or more
linked working directories. These working directories and the main
repository share the same repository directory.
In linked working directories, $GIT_COMMON_DIR must be defined to point
to the real repository directory and $GIT_DIR points to an unused
subdirectory inside $GIT_COMMON_DIR. File locations inside the
repository are reorganized from the linked worktree view point:
- worktree-specific such as HEAD, logs/HEAD, index, other top-level
refs and unrecognized files are from $GIT_DIR.
- the rest like objects, refs, info, hooks, packed-refs, shallow...
are from $GIT_COMMON_DIR (except info/sparse-checkout, but that's
a separate patch)
Scripts are supposed to retrieve paths in $GIT_DIR with "git rev-parse
--git-path", which will take care of "$GIT_DIR vs $GIT_COMMON_DIR"
business.
The redirection is done by git_path(), git_pathdup() and
strbuf_git_path(). The selected list of paths goes to $GIT_COMMON_DIR,
not the other way around in case a developer adds a new
worktree-specific file and it's accidentally promoted to be shared
across repositories (this includes unknown files added by third party
commands)
The list of known files that belong to $GIT_DIR are:
ADD_EDIT.patch BISECT_ANCESTORS_OK BISECT_EXPECTED_REV BISECT_LOG
BISECT_NAMES CHERRY_PICK_HEAD COMMIT_MSG FETCH_HEAD HEAD MERGE_HEAD
MERGE_MODE MERGE_RR NOTES_EDITMSG NOTES_MERGE_WORKTREE ORIG_HEAD
REVERT_HEAD SQUASH_MSG TAG_EDITMSG fast_import_crash_* logs/HEAD
next-index-* rebase-apply rebase-merge rsync-refs-* sequencer/*
shallow_*
Path mapping is NOT done for git_path_submodule(). Multi-checkouts are
not supported as submodules.
Helped-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-11-30 09:24:36 +01:00
|
|
|
test_git_path GIT_COMMON_DIR=bar hooks/me bar/hooks/me
|
|
|
|
|
test_git_path GIT_COMMON_DIR=bar config bar/config
|
|
|
|
|
test_git_path GIT_COMMON_DIR=bar packed-refs bar/packed-refs
|
|
|
|
|
test_git_path GIT_COMMON_DIR=bar shallow bar/shallow
|
2014-11-30 09:24:31 +01:00
|
|
|
|
2008-05-20 08:48:54 +02:00
|
|
|
test_done
|