mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase: warn about the correct tree's OID

Browse Source 
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>
This commit is contained in:
Johannes Schindelin
2018-11-20 01:44:33 -08:00
committed by Junio C Hamano
parent bac2a1e36f
commit 4d86503eed
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/rebase.c
View File

@ -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)) { 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; goto leave_reset_head;
} }