diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-11-20 01:44:33 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-11-21 13:48:11 +0900 |
| commit | 4d86503eed995fe27bfa284b55fc63328534d11b (patch) | |
| tree | 19cc3517d1087ad5170f661dbe99c64509535ba4 /builtin | |
| parent | built-in rebase: reinstate `checkout -q` behavior where appropriate (diff) | |
| download | tgif-4d86503eed995fe27bfa284b55fc63328534d11b.tar.xz | |
rebase: warn about the correct tree's OID
This was a simple copy/paste error, and an obvious one at that: if we
cannot fill the tree descriptor, we should show an error message about
*that* tree, not another one.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/rebase.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index dc78c1497d..f4f29a3174 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -576,7 +576,8 @@ static int reset_head(struct object_id *oid, const char *action, } if (!reset_hard && !fill_tree_descriptor(&desc[nr++], &head_oid)) { - ret = error(_("failed to find tree of %s"), oid_to_hex(oid)); + ret = error(_("failed to find tree of %s"), + oid_to_hex(&head_oid)); goto leave_reset_head; } |