rebase: report invalid commit correctly
In 9765b6a (rebase: align variable content, 2011-02-06), the code to error out was moved up one level. Unfortunately, one reference to a function parameter wasn't rewritten as it should, leading to the wrong parameter being errored on. This error was propagated by 71786f5 (rebase: factor out reference parsing, 2011-02-06) and merged in 78c6e0f (Merge branch 'mz/rebase', 2011-04-28). Correct this by reporting $onto_name istead. Reported-By: Manuela Hutter <manuelah@opera.com> Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Erik Faye-Lund committed
May 30, 2012 at 18:39 UTC
9180feafbc7c637a4fae72d1ca1d3b2245b4302c
2 files changed
+6
-1
git-rebase.sh
+1
-1
@@ -469,7 +469,7 @@ case "$onto_name" in
469
;;
470
*)
471
onto=$(git rev-parse --verify "${onto_name}^0") ||
472
- die "Does not point to a valid commit: $1"
472
+ die "Does not point to a valid commit: $onto_name"
473
;;
474
esac
475
t/t3406-rebase-message.sh
+5
@@ -62,4 +62,9 @@ test_expect_success 'rebase -n overrides config rebase.stat config' '
62
! grep "^ fileX | *1 +$" diffstat.txt
63
'
64
65
+test_expect_success 'rebase --onto outputs the invalid ref' '
66
+ test_must_fail git rebase --onto invalid-ref HEAD HEAD 2>err &&
67
+ grep "invalid-ref" err
68
+'
69
+
70
test_done