diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-21 20:39:01 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-21 20:39:01 +0900 |
| commit | c17f086ecad796b4179aa1b0209f00d4f8ffdc0f (patch) | |
| tree | 2b26a57bd1b47f159447f11df86702907377b047 /builtin/rebase.c | |
| parent | Prepare for 2.20-rc1 (diff) | |
| parent | rebase: warn about the correct tree's OID (diff) | |
| download | git-c17f086ecad796b4179aa1b0209f00d4f8ffdc0f.tar.gz git-c17f086ecad796b4179aa1b0209f00d4f8ffdc0f.zip | |
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
Diffstat (limited to 'builtin/rebase.c')
| -rw-r--r-- | builtin/rebase.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index 1a2758756a..5b3e5baec8 100644 --- 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; } |