diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-06-03 15:52:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-03 15:52:18 -0700 |
| commit | 06de561830250f92e056b0a57bc52b27b13ba2ac (patch) | |
| tree | 30f565b258771ba9cffeeaa04a0c02c755cf28e2 /git-rebase.sh | |
| parent | Start preparing for 1.7.10.4 (diff) | |
| parent | rebase: report invalid commit correctly (diff) | |
| download | tgif-06de561830250f92e056b0a57bc52b27b13ba2ac.tar.xz | |
Merge branch 'ef/maint-rebase-error-message' into maint
When "git rebase" was given a bad commit to replay the history on,
its error message did not correctly give the command line argument
it had trouble parsing.
By Erik Faye-Lund
* ef/maint-rebase-error-message:
rebase: report invalid commit correctly
Diffstat (limited to 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 69c1374823..03f73da887 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -418,7 +418,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 |