Skip to content

Commit c17f086

Browse files
committed
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
2 parents bb75be6 + 4d86503 commit c17f086

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

builtin/rebase.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,8 @@ static int reset_head(struct object_id *oid, const char *action,
582582
}
583583

584584
if (!reset_hard && !fill_tree_descriptor(&desc[nr++], &head_oid)) {
585-
ret = error(_("failed to find tree of %s"), oid_to_hex(oid));
585+
ret = error(_("failed to find tree of %s"),
586+
oid_to_hex(&head_oid));
586587
goto leave_reset_head;
587588
}
588589

0 commit comments

Comments
 (0)