merge(third_party/git): Merge squashed git subtree at v2.23.0
Merge commit '1b593e1ea4' as 'third_party/git'
This commit is contained in:
Vincent Ambo
commit
7ef0d62730
3629 changed files with 1139935 additions and 0 deletions
164
third_party/git/t/t1500-rev-parse.sh
vendored
Executable file
164
third_party/git/t/t1500-rev-parse.sh
vendored
Executable file
|
|
@ -0,0 +1,164 @@
|
|||
#!/bin/sh
|
||||
|
||||
test_description='test git rev-parse'
|
||||
. ./test-lib.sh
|
||||
|
||||
# usage: [options] label is-bare is-inside-git is-inside-work prefix git-dir absolute-git-dir
|
||||
test_rev_parse () {
|
||||
d=
|
||||
bare=
|
||||
gitdir=
|
||||
while :
|
||||
do
|
||||
case "$1" in
|
||||
-C) d="$2"; shift; shift ;;
|
||||
-b) case "$2" in
|
||||
[tfu]*) bare="$2"; shift; shift ;;
|
||||
*) error "test_rev_parse: bogus core.bare value '$2'" ;;
|
||||
esac ;;
|
||||
-g) gitdir="$2"; shift; shift ;;
|
||||
-*) error "test_rev_parse: unrecognized option '$1'" ;;
|
||||
*) break ;;
|
||||
esac
|
||||
done
|
||||
|
||||
name=$1
|
||||
shift
|
||||
|
||||
for o in --is-bare-repository \
|
||||
--is-inside-git-dir \
|
||||
--is-inside-work-tree \
|
||||
--show-prefix \
|
||||
--git-dir \
|
||||
--absolute-git-dir
|
||||
do
|
||||
test $# -eq 0 && break
|
||||
expect="$1"
|
||||
test_expect_success "$name: $o" '
|
||||
if test -n "$gitdir"
|
||||
then
|
||||
test_when_finished "unset GIT_DIR" &&
|
||||
GIT_DIR="$gitdir" &&
|
||||
export GIT_DIR
|
||||
fi &&
|
||||
|
||||
case "$bare" in
|
||||
t*) test_config ${d:+-C} ${d:+"$d"} core.bare true ;;
|
||||
f*) test_config ${d:+-C} ${d:+"$d"} core.bare false ;;
|
||||
u*) test_unconfig ${d:+-C} ${d:+"$d"} core.bare ;;
|
||||
esac &&
|
||||
|
||||
echo "$expect" >expect &&
|
||||
git ${d:+-C} ${d:+"$d"} rev-parse $o >actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
shift
|
||||
done
|
||||
}
|
||||
|
||||
ROOT=$(pwd)
|
||||
|
||||
test_expect_success 'setup' '
|
||||
mkdir -p sub/dir work &&
|
||||
cp -R .git repo.git
|
||||
'
|
||||
|
||||
test_rev_parse toplevel false false true '' .git "$ROOT/.git"
|
||||
|
||||
test_rev_parse -C .git .git/ false true false '' . "$ROOT/.git"
|
||||
test_rev_parse -C .git/objects .git/objects/ false true false '' "$ROOT/.git" "$ROOT/.git"
|
||||
|
||||
test_rev_parse -C sub/dir subdirectory false false true sub/dir/ "$ROOT/.git" "$ROOT/.git"
|
||||
|
||||
test_rev_parse -b t 'core.bare = true' true false false
|
||||
|
||||
test_rev_parse -b u 'core.bare undefined' false false true
|
||||
|
||||
|
||||
test_rev_parse -C work -g ../.git -b f 'GIT_DIR=../.git, core.bare = false' false false true '' "../.git" "$ROOT/.git"
|
||||
|
||||
test_rev_parse -C work -g ../.git -b t 'GIT_DIR=../.git, core.bare = true' true false false ''
|
||||
|
||||
test_rev_parse -C work -g ../.git -b u 'GIT_DIR=../.git, core.bare undefined' false false true ''
|
||||
|
||||
|
||||
test_rev_parse -C work -g ../repo.git -b f 'GIT_DIR=../repo.git, core.bare = false' false false true '' "../repo.git" "$ROOT/repo.git"
|
||||
|
||||
test_rev_parse -C work -g ../repo.git -b t 'GIT_DIR=../repo.git, core.bare = true' true false false ''
|
||||
|
||||
test_rev_parse -C work -g ../repo.git -b u 'GIT_DIR=../repo.git, core.bare undefined' false false true ''
|
||||
|
||||
test_expect_success 'git-common-dir from worktree root' '
|
||||
echo .git >expect &&
|
||||
git rev-parse --git-common-dir >actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success 'git-common-dir inside sub-dir' '
|
||||
mkdir -p path/to/child &&
|
||||
test_when_finished "rm -rf path" &&
|
||||
echo "$(git -C path/to/child rev-parse --show-cdup).git" >expect &&
|
||||
git -C path/to/child rev-parse --git-common-dir >actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success 'git-path from worktree root' '
|
||||
echo .git/objects >expect &&
|
||||
git rev-parse --git-path objects >actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success 'git-path inside sub-dir' '
|
||||
mkdir -p path/to/child &&
|
||||
test_when_finished "rm -rf path" &&
|
||||
echo "$(git -C path/to/child rev-parse --show-cdup).git/objects" >expect &&
|
||||
git -C path/to/child rev-parse --git-path objects >actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success 'rev-parse --is-shallow-repository in shallow repo' '
|
||||
test_commit test_commit &&
|
||||
echo true >expect &&
|
||||
git clone --depth 1 --no-local . shallow &&
|
||||
test_when_finished "rm -rf shallow" &&
|
||||
git -C shallow rev-parse --is-shallow-repository >actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success 'rev-parse --is-shallow-repository in non-shallow repo' '
|
||||
echo false >expect &&
|
||||
git rev-parse --is-shallow-repository >actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_expect_success 'showing the superproject correctly' '
|
||||
git rev-parse --show-superproject-working-tree >out &&
|
||||
test_must_be_empty out &&
|
||||
|
||||
test_create_repo super &&
|
||||
test_commit -C super test_commit &&
|
||||
test_create_repo sub &&
|
||||
test_commit -C sub test_commit &&
|
||||
git -C super submodule add ../sub dir/sub &&
|
||||
echo $(pwd)/super >expect &&
|
||||
git -C super/dir/sub rev-parse --show-superproject-working-tree >out &&
|
||||
test_cmp expect out &&
|
||||
|
||||
test_commit -C super submodule_add &&
|
||||
git -C super checkout -b branch1 &&
|
||||
git -C super/dir/sub checkout -b branch1 &&
|
||||
test_commit -C super/dir/sub branch1_commit &&
|
||||
git -C super add dir/sub &&
|
||||
test_commit -C super branch1_commit &&
|
||||
git -C super checkout -b branch2 master &&
|
||||
git -C super/dir/sub checkout -b branch2 master &&
|
||||
test_commit -C super/dir/sub branch2_commit &&
|
||||
git -C super add dir/sub &&
|
||||
test_commit -C super branch2_commit &&
|
||||
test_must_fail git -C super merge branch1 &&
|
||||
|
||||
git -C super/dir/sub rev-parse --show-superproject-working-tree >out &&
|
||||
test_cmp expect out
|
||||
'
|
||||
|
||||
test_done
|
||||
Loading…
Add table
Add a link
Reference in a new issue