Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'js/builtin-rebase-perf-fix-err-fix'
author
Junio C Hamano
<gitster@pobox.com>
Wed, 21 Nov 2018 11:39:01 +0000
(20:39 +0900)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 21 Nov 2018 11:39:01 +0000
(20:39 +0900)
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
builtin/rebase.c
patch
|
blob
|
history
raw
(from parent 1:
bb75be6
)
diff --git
a/builtin/rebase.c
b/builtin/rebase.c
index 1a2758756af6918314dccb74aa691da403fb4132..5b3e5baec8a09fb19798c71b201d08f88225e7af 100644
(file)
--- a/
builtin/rebase.c
+++ b/
builtin/rebase.c
@@
-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;
}