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 /builtin/merge-recursive.c | |
| parent | 71786f54c4128821eab8a23f258848c76b5a2071 (diff) | |
| download | git-9180feafbc7c637a4fae72d1ca1d3b2245b4302c.tar.gz | |
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>
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions