From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 21 Nov 2018 11:39:01 +0000 (+0900)
Subject: Merge branch 'js/builtin-rebase-perf-fix-err-fix'
X-Git-Tag: v2.20.0-rc1~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c17f086ecad796b4179aa1b0209f00d4f8ffdc0f?hp=bb75be6cb916297f271c846f2f9caa3daaaec718

Merge branch 'js/builtin-rebase-perf-fix-err-fix'

The object name of the tree reported in a recently added error
message was wrong, which has been corrected.

* js/builtin-rebase-perf-fix-err-fix:
rebase: warn about the correct tree's OID
---

diff --git a/builtin/rebase.c b/builtin/rebase.c
index 1a2758756a..5b3e5baec8 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -582,7 +582,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;
 	}