git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v2 2/4] t6050: redirect expected error output to a file

From
Christian Couder <christian.couder@gmail.com>
Date
Mar 31, 2019, 13:46 UTC
Message-ID
<20190331134659.28808-3-chriscool@tuxfamily.org>
In-Reply-To
<20190331134659.28808-1-chriscool@tuxfamily.org>

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>
---
 t/t6050-replace.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index 41b177936e..948d278482 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 ()
-- 
2.21.0.69.g2d86a08d09
Previous: Christian CouderNext: Christian Couder
Message 4 of 6 in “fix `git replace --graft` tag related issues”
  1. 0/4 fix `git replace --graft` tag related issuesChristian Couder, Mar 31, 2019
  2. 1/4 t6050: use test_line_count instead of wc -lChristian Couder, Mar 31, 2019
  3. 3/4 replace: fix --graft when passing a tag as parentChristian Couder, Mar 31, 2019
  4. 2/4 t6050: redirect expected error output to a fileChristian Couder, Mar 31, 2019
  5. 4/4 replace: fix --graft when passing a tag firstChristian Couder, Mar 31, 2019
  6. Junio C HamanoApr 1, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.