sequencer: rename reset_for_rollback to reset_merge

diff --git a/builtin/upload-pack.c b/builtin/upload-pack.c
index a757df8da0abe7e979fe6b14aabe88da4cda548a..6da8fa2607c6b831c69a76c5bb2ec5caec444d54 100644 (file)
--- a/builtin/upload-pack.c
+++ b/builtin/upload-pack.c
@@ -1,6 +1,6 @@
 #include "cache.h"
 #include "builtin.h"
-#include "exec_cmd.h"
+#include "exec-cmd.h"
 #include "pkt-line.h"
 #include "parse-options.h"
 #include "protocol.h"
@@ -31,9 +31,9 @@ int cmd_upload_pack(int argc, const char **argv, const char *prefix)
        };
 
        packet_trace_identity("upload-pack");
-       check_replace_refs = 0;
+       read_replace_refs = 0;
 
-       argc = parse_options(argc, argv, NULL, options, upload_pack_usage, 0);
+       argc = parse_options(argc, argv, prefix, options, upload_pack_usage, 0);
 
        if (argc != 1)
                usage_with_options(upload_pack_usage, options);