Merge branch 'ef/maint-rebase-error-message'

By Erik Faye-Lund * ef/maint-rebase-error-message: rebase: report invalid commit correctly
lastomato · Jun 1, 2012 · 3ba4663 · 3ba4663
2 parents 264d5a7 + 9180fea
commit 3ba4663
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/git-rebase.sh b/git-rebase.sh
@@ -424,7 +424,7 @@ case "$onto_name" in
 	;;
 *)
 	onto=$(git rev-parse --verify "${onto_name}^0") ||
-	die "Does not point to a valid commit: $1"
+	die "Does not point to a valid commit: $onto_name"
 	;;
 esac
 

diff --git a/t/t3406-rebase-message.sh b/t/t3406-rebase-message.sh
@@ -62,4 +62,9 @@ test_expect_success 'rebase -n overrides config rebase.stat config' '
         ! grep "^ fileX |  *1 +$" diffstat.txt
 '
 
+test_expect_success 'rebase --onto outputs the invalid ref' '
+	test_must_fail git rebase --onto invalid-ref HEAD HEAD 2>err &&
+	grep "invalid-ref" err
+'
+
 test_done