Merge branch 'nd/branch-v-alignment'

diff --git a/t/t3406-rebase-message.sh b/t/t3406-rebase-message.sh
index fe5f936988bc5ec9bbe6d9175ef6e085c422eadc..e6a9a0d436f3a28a7de6eaadd7f1f223ae740c64 100755 (executable)
--- a/t/t3406-rebase-message.sh
+++ b/t/t3406-rebase-message.sh
@@ -62,4 +62,16 @@ test_expect_success 'rebase -n overrides config rebase.stat config' '
         ! grep "^ fileX |  *1 +$" diffstat.txt
 '
 
+# Output to stderr:
+#
+#     "Does not point to a valid commit: invalid-ref"
+#
+# NEEDSWORK: This "grep" is fine in real non-C locales, but
+# GETTEXT_POISON poisons the refname along with the enclosing
+# error message.
+test_expect_success 'rebase --onto outputs the invalid ref' '
+       test_must_fail git rebase --onto invalid-ref HEAD HEAD 2>err &&
+       test_i18ngrep "invalid-ref" err
+'
+
 test_done