diff options
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/replace.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/builtin/replace.c b/builtin/replace.c index 730a6448ae..a06dc2b501 100644 --- a/builtin/replace.c +++ b/builtin/replace.c @@ -477,15 +477,18 @@ static int create_graft(int argc, const char **argv, int force, int gentle) strbuf_release(&buf); - if (oideq(&old_oid, &new_oid)) { + if (oideq(&commit->object.oid, &new_oid)) { if (gentle) { - warning(_("graft for '%s' unnecessary"), oid_to_hex(&old_oid)); + warning(_("graft for '%s' unnecessary"), + oid_to_hex(&commit->object.oid)); return 0; } - return error(_("new commit is the same as the old one: '%s'"), oid_to_hex(&old_oid)); + return error(_("new commit is the same as the old one: '%s'"), + oid_to_hex(&commit->object.oid)); } - return replace_object_oid(old_ref, &old_oid, "replacement", &new_oid, force); + return replace_object_oid(old_ref, &commit->object.oid, + "replacement", &new_oid, force); } static int convert_graft_file(int force) |