mirror of
https://github.com/git/git.git
synced 2024-11-18 20:53:55 +01:00
e90fdc39b6
The old version of work-tree support was an unholy mess, barely readable, and not to the point. For example, why do you have to provide a worktree, when it is not used? As in "git status". Now it works. Another riddle was: if you can have work trees inside the git dir, why are some programs complaining that they need a work tree? IOW it is allowed to call $ git --git-dir=../ --work-tree=. bla when you really want to. In this case, you are both in the git directory and in the working tree. So, programs have to actually test for the right thing, namely if they are inside a working tree, and not if they are inside a git directory. Also, GIT_DIR=../.git should behave the same as if no GIT_DIR was specified, unless there is a repository in the current working directory. It does now. The logic to determine if a repository is bare, or has a work tree (tertium non datur), is this: --work-tree=bla overrides GIT_WORK_TREE, which overrides core.bare = true, which overrides core.worktree, which overrides GIT_DIR/.. when GIT_DIR ends in /.git, which overrides the directory in which .git/ was found. In related news, a long standing bug was fixed: when in .git/bla/x.git/, which is a bare repository, git formerly assumed ../.. to be the appropriate git dir. This problem was reported by Shawn Pearce to have caused much pain, where a colleague mistakenly ran "git init" in "/" a long time ago, and bare repositories just would not work. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
78 lines
1.9 KiB
Bash
Executable File
78 lines
1.9 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='test git rev-parse'
|
|
. ./test-lib.sh
|
|
|
|
test_rev_parse() {
|
|
name=$1
|
|
shift
|
|
|
|
test_expect_success "$name: is-bare-repository" \
|
|
"test '$1' = \"\$(git rev-parse --is-bare-repository)\""
|
|
shift
|
|
[ $# -eq 0 ] && return
|
|
|
|
test_expect_success "$name: is-inside-git-dir" \
|
|
"test '$1' = \"\$(git rev-parse --is-inside-git-dir)\""
|
|
shift
|
|
[ $# -eq 0 ] && return
|
|
|
|
test_expect_success "$name: is-inside-work-tree" \
|
|
"test '$1' = \"\$(git rev-parse --is-inside-work-tree)\""
|
|
shift
|
|
[ $# -eq 0 ] && return
|
|
|
|
test_expect_success "$name: prefix" \
|
|
"test '$1' = \"\$(git rev-parse --show-prefix)\""
|
|
shift
|
|
[ $# -eq 0 ] && return
|
|
}
|
|
|
|
test_rev_parse toplevel false false true ''
|
|
|
|
cd .git || exit 1
|
|
test_rev_parse .git/ true true false ''
|
|
cd objects || exit 1
|
|
test_rev_parse .git/objects/ true true false ''
|
|
cd ../.. || exit 1
|
|
|
|
mkdir -p sub/dir || exit 1
|
|
cd sub/dir || exit 1
|
|
test_rev_parse subdirectory false false true sub/dir/
|
|
cd ../.. || exit 1
|
|
|
|
git config core.bare true
|
|
test_rev_parse 'core.bare = true' true false false
|
|
|
|
git config --unset core.bare
|
|
test_rev_parse 'core.bare undefined' false false true
|
|
|
|
mkdir work || exit 1
|
|
cd work || exit 1
|
|
export GIT_DIR=../.git
|
|
export GIT_CONFIG="$(pwd)"/../.git/config
|
|
|
|
git config core.bare false
|
|
test_rev_parse 'GIT_DIR=../.git, core.bare = false' false false true work/
|
|
|
|
git config core.bare true
|
|
test_rev_parse 'GIT_DIR=../.git, core.bare = true' true false false ''
|
|
|
|
git config --unset core.bare
|
|
test_rev_parse 'GIT_DIR=../.git, core.bare undefined' false false true work/
|
|
|
|
mv ../.git ../repo.git || exit 1
|
|
export GIT_DIR=../repo.git
|
|
export GIT_CONFIG="$(pwd)"/../repo.git/config
|
|
|
|
git config core.bare false
|
|
test_rev_parse 'GIT_DIR=../repo.git, core.bare = false' false false true ''
|
|
|
|
git config core.bare true
|
|
test_rev_parse 'GIT_DIR=../repo.git, core.bare = true' true false false ''
|
|
|
|
git config --unset core.bare
|
|
test_rev_parse 'GIT_DIR=../repo.git, core.bare undefined' false false true ''
|
|
|
|
test_done
|