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

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

Browse Source 
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
This commit is contained in:
Junio C Hamano
2018-11-21 20:39:01 +09:00
parent bb75be6cb9 4d86503eed
commit c17f086eca
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

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