Merge branch 'sr/add--interactive-term-readkey'

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 8b89f8121ad0225117f7864e7b552d6e02f5ac45..1fb972f45aa9076926f4a6cda1dd1034a53b4573 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -823,7 +823,7 @@ static void write_pack_file(void)
                                utb.modtime = --last_mtime;
                                if (utime(pack_tmp_name, &utb) < 0)
                                        warning("failed utime() on %s: %s",
-                                               tmpname, strerror(errno));
+                                               pack_tmp_name, strerror(errno));
                        }
 
                        /* Enough space for "-<sha-1>.pack"? */
@@ -2612,7 +2612,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
                OPT_END(),
        };
 
-       read_replace_refs = 0;
+       check_replace_refs = 0;
 
        reset_pack_idx_option(&pack_idx_opts);
        git_config(git_pack_config, NULL);