diff options
| author |  Erik Faye-Lund <kusmabite@gmail.com> | 2012-05-30 18:39:42 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-05-30 11:59:08 -0700 |
| commit | 9180feafbc7c637a4fae72d1ca1d3b2245b4302c (patch) | |
| tree | 8975a43b9afb82e8a9821413500c6523214c4425 | |
| parent | rebase: factor out reference parsing (diff) | |
| download | tgif-9180feafbc7c637a4fae72d1ca1d3b2245b4302c.tar.xz | |
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>
| -rwxr-xr-x | git-rebase.sh | 2 | ||||
| -rwxr-xr-x | t/t3406-rebase-message.sh | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 0f5f5fb206..5e3c42cb11 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -469,7 +469,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 index fe5f936988..6898377910 100755 --- 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 |