t6050: redirect expected error output to a file
authorChristian Couder <christian.couder@gmail.com>
Sun, 31 Mar 2019 13:46:57 +0000 (15:46 +0200)
committerJunio C Hamano <gitster@pobox.com>
Mon, 1 Apr 2019 08:49:00 +0000 (17:49 +0900)
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>
t/t6050-replace.sh
index 41b177936e383c1ef0302f080816f1eb564aa196..948d2784824e6274201390a3b66bffd30d005c7b 100755 (executable)
@@ -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 ()