summaryrefslogtreecommitdiff
path: root/t/t6120-describe.sh
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2021-04-12 11:21:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-05-11 03:48:09 (GMT)
commit64568c717159b31b5a37d2c1bb284c71e6cd011f (patch)
tree6fef10c2b67bd44b873ec25f6ace05dbef3aed0f /t/t6120-describe.sh
parent33b4ae11146ba0c468176d238d231e1101ba19cd (diff)
downloadgit-64568c717159b31b5a37d2c1bb284c71e6cd011f.zip
git-64568c717159b31b5a37d2c1bb284c71e6cd011f.tar.gz
git-64568c717159b31b5a37d2c1bb284c71e6cd011f.tar.bz2
describe tests: support -C in "check_describe"
Change a subshell added in a preceding commit to instead use a new "-C" option to "check_describe". The idiom for this is copied as-is from the "test_commit" function in test-lib-functions.sh Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6120-describe.sh')
-rwxr-xr-xt/t6120-describe.sh27
1 files changed, 18 insertions, 9 deletions
diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
index 9dc0778..1a501ee 100755
--- a/t/t6120-describe.sh
+++ b/t/t6120-describe.sh
@@ -17,11 +17,26 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh
check_describe () {
+ indir= &&
+ while test $# != 0
+ do
+ case "$1" in
+ -C)
+ indir="$2"
+ shift
+ ;;
+ *)
+ break
+ ;;
+ esac
+ shift
+ done &&
+ indir=${indir:+"$indir"/} &&
expect="$1"
shift
describe_opts="$@"
test_expect_success "describe $describe_opts" '
- git describe $describe_opts >raw &&
+ git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
echo "$expect" >expect &&
test_cmp expect actual
@@ -486,10 +501,7 @@ test_expect_success 'setup: describe commits with disjoint bases' '
)
'
-(
- cd disjoint1 &&
- check_describe "A-3-gHASH" HEAD
-)
+check_describe -C disjoint1 "A-3-gHASH" HEAD
# B
# o---o---o------------.
@@ -515,9 +527,6 @@ test_expect_success 'setup: describe commits with disjoint bases 2' '
)
'
-(
- cd disjoint2 &&
- check_describe "B-3-gHASH" HEAD
-)
+check_describe -C disjoint2 "B-3-gHASH" HEAD
test_done