summaryrefslogtreecommitdiff
path: root/t/t6050-replace.sh
diff options
context:
space:
mode:
authorChristian Couder <christian.couder@gmail.com>2019-03-31 13:46:57 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-04-01 08:49:00 (GMT)
commit587617016744448ace200804aed9edccb436f38e (patch)
tree203cc45f0acf29c0914eb6e145270cd7376f43fc /t/t6050-replace.sh
parent502d87b9e3ee6faadae45d545e0e257ef8948f0b (diff)
downloadgit-587617016744448ace200804aed9edccb436f38e.zip
git-587617016744448ace200804aed9edccb436f38e.tar.gz
git-587617016744448ace200804aed9edccb436f38e.tar.bz2
t6050: redirect expected error output to a file
Otherwise the error from `git rev-parse` is uselessly polluting the debug output. Redirecting to a file, instead of /dev/null, makes it possible to check that we got the error we expected, so let's check that too. Reviewed-by: Taylor Blau <me@ttaylorr.com> Helped-by: Eric Sunshine <sunshine@sunshineco.com> Helped-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6050-replace.sh')
-rwxr-xr-xt/t6050-replace.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index 41b1779..948d278 100755
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh
@@ -40,7 +40,8 @@ commit_peeling_shows_parents ()
test "$_found" = "$_parent" || return 1
_parent_number=$(( $_parent_number + 1 ))
done &&
- test_must_fail git rev-parse --verify $_commit^$_parent_number
+ test_must_fail git rev-parse --verify $_commit^$_parent_number 2>err &&
+ test_i18ngrep "Needed a single revision" err
}
commit_has_parents ()