From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 20 Nov 2018 09:44:33 +0000 (-0800)
Subject: rebase: warn about the correct tree's OID
X-Git-Tag: v2.20.0-rc1~8^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4d86503eed995fe27bfa284b55fc63328534d11b?ds=inline;hp=--cc

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>
---

4d86503eed995fe27bfa284b55fc63328534d11b
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;
 	}