pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches

diff --git a/builtin-unpack-objects.c b/builtin-unpack-objects.c
index 3d650a1c41a4529863818fd613b95e83668bbfc1..685566e0b5e458c510fdf989744d63dda29e28f0 100644 (file)
--- a/builtin-unpack-objects.c
+++ b/builtin-unpack-objects.c
@@ -497,6 +497,8 @@ int cmd_unpack_objects(int argc, const char **argv, const char *prefix)
        int i;
        unsigned char sha1[20];
 
+       read_replace_refs = 0;
+
        git_config(git_default_config, NULL);
 
        quiet = !isatty(2);