rebase: warn about the correct tree's OID

A quick fix for a recent topic. Not overly critical, but I would deem this v2.20.0-rc1 material.

Johannes Schindelin (1):
rebase: warn about the correct tree's OID

 builtin/rebase.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

base-commit: bb75be6cb916297f271c846f2f9caa3daaaec718
Published-As: https://github.com/gitgitgadget/git/releases/tags/pr-85%2Fdscho%2Freset_head-typo-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-85/dscho/reset_head-typo-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/85

gitgitgadget

From: Johannes Schindelin <[email protected]>

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.

---
 builtin/rebase.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

index 1a2758756a..5b3e5baec8 100644
@@ -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;
 	}
 

gitgitgadget

"Johannes Schindelin via GitGitGadget" <[email protected]>

Yup, it is kind of embarrasing that nobody caught it, but at the same time, this typo is at so tiny level that I would not be surprised if it survived for many years.

Will apply.

Hi Junio,

TBH I am quite mortified that it slipped through *my* multiple pre-contribution reviews.

Thanks.

Ciao,
Dscho