Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
diff --color-moved-ws: handle blank lines
[gitweb.git]
/
builtin
/
rebase.c
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;
}