diff options
| author |  SZEDER Gábor <szeder.dev@gmail.com> | 2019-11-12 11:38:10 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-12-06 13:28:55 -0800 |
| commit | c593a2634837234c91afc875cb569a53fbaadbfb (patch) | |
| tree | 4e1799a42dae4b724209a829bae8684250359c2e /t | |
| parent | t6120-describe: correct test repo history graph in comment (diff) | |
| download | tgif-c593a2634837234c91afc875cb569a53fbaadbfb.tar.xz | |
t6120-describe: modernize the 'check_describe' helper
The 'check_describe' helper function runs 'git describe' outside of
'test_expect_success' blocks, with extra hand-rolled code to record
and examine its exit code.
Update this helper and move the 'git describe' invocation inside the
'test_expect_success' block.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6120-describe.sh | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh index 9b184179d1..a2988fa0c2 100755 --- a/t/t6120-describe.sh +++ b/t/t6120-describe.sh @@ -16,14 +16,12 @@ test_description='test describe' check_describe () { expect="$1" shift - R=$(git describe "$@" 2>err.actual) - S=$? - cat err.actual >&3 - test_expect_success "describe $*" ' - test $S = 0 && + describe_opts="$@" + test_expect_success "describe $describe_opts" ' + R=$(git describe $describe_opts 2>err.actual) && case "$R" in $expect) echo happy ;; - *) echo "Oops - $R is not $expect"; + *) echo "Oops - $R is not $expect" && false ;; esac ' |