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

diff --git a/environment.c b/environment.c
index 5de683784039f20b55f58ef36cb04a11f6a10610..739ec2704031f0dd9d4a380e07f001c09742a7be 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -49,7 +49,9 @@ enum push_default_type push_default = PUSH_DEFAULT_MATCHING;
 #define OBJECT_CREATION_MODE OBJECT_CREATION_USES_HARDLINKS
 #endif
 enum object_creation_mode object_creation_mode = OBJECT_CREATION_MODE;
+char *notes_ref_name;
 int grafts_replace_parents = 1;
+int core_apply_sparse_checkout;
 
 /* Parallel index stat data preload? */
 int core_preload_index = 0;
@@ -83,6 +85,8 @@ static void setup_git_env(void)
        git_graft_file = getenv(GRAFT_ENVIRONMENT);
        if (!git_graft_file)
                git_graft_file = git_pathdup("info/grafts");
+       if (getenv(NO_REPLACE_OBJECTS_ENVIRONMENT))
+               read_replace_refs = 0;
 }
 
 int is_bare_repository(void)