Merge branch 'ab/perf-installed-fix'
[gitweb.git] / builtin / replace.c
index f5701629a8a5698a64c91ca92226e6da72697441..644b21ca8d57a75fa83ecbf0e58dd07a685cd9e4 100644 (file)
@@ -370,16 +370,19 @@ static int replace_parents(struct strbuf *buf, int argc, const char **argv)
        /* prepare new parents */
        for (i = 0; i < argc; i++) {
                struct object_id oid;
+               struct commit *commit;
+
                if (get_oid(argv[i], &oid) < 0) {
                        strbuf_release(&new_parents);
                        return error(_("not a valid object name: '%s'"),
                                     argv[i]);
                }
-               if (!lookup_commit_reference(the_repository, &oid)) {
+               commit = lookup_commit_reference(the_repository, &oid);
+               if (!commit) {
                        strbuf_release(&new_parents);
-                       return error(_("could not parse %s"), argv[i]);
+                       return error(_("could not parse %s as a commit"), argv[i]);
                }
-               strbuf_addf(&new_parents, "parent %s\n", oid_to_hex(&oid));
+               strbuf_addf(&new_parents, "parent %s\n", oid_to_hex(&commit->object.oid));
        }
 
        /* replace existing parents with new ones */
@@ -478,15 +481,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)