From be7bae0d4821462c50c5b82633edb372fe971e9e Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Mon, 3 Mar 2008 20:09:31 -0500 Subject: [PATCH] Don't allow git-describe failures to go unnoticed in t6120 If git-describe fails we never execute the test_expect_success, so we never actually test for failure. This is horribly wrong. We need to always run the test case, but the test case is only supposed to succeed if the prior git-describe returned 0. Signed-off-by: Shawn O. Pearce Signed-off-by: Junio C Hamano --- t/t6120-describe.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh index a7557bdc79..ba9ea60d10 100755 --- a/t/t6120-describe.sh +++ b/t/t6120-describe.sh @@ -15,8 +15,10 @@ test_description='test describe check_describe () { expect="$1" shift - R=$(git describe "$@") && + R=$(git describe "$@") + S=$? test_expect_success "describe $*" ' + test $S = 0 && case "$R" in $expect) echo happy ;; *) echo "Oops - $R is not $expect"; -- 2.11.4.GIT