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
This commit is contained in:
		| @ -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; | ||||
| 	} | ||||
|  | ||||
|  | ||||
		Reference in New Issue
	
	Block a user
	 Junio C Hamano
					Junio C Hamano