Merge branch 'nd/remove-ignore-env-field'

diff --git a/fast-import.c b/fast-import.c
index b300e4416de38cf7f2bed96da988e7de861f0a09..a2e8b1d763a30e1bbec97a92da46c82f0f33353d 100644 (file)
--- a/fast-import.c
+++ b/fast-import.c
@@ -3006,7 +3006,7 @@ static void cat_blob(struct object_entry *oe, struct object_id *oid)
 
 static void parse_get_mark(const char *p)
 {
-       struct object_entry *oe = oe;
+       struct object_entry *oe;
        char output[GIT_MAX_HEXSZ + 2];
 
        /* get-mark SP <object> LF */
@@ -3023,7 +3023,7 @@ static void parse_get_mark(const char *p)
 
 static void parse_cat_blob(const char *p)
 {
-       struct object_entry *oe = oe;
+       struct object_entry *oe;
        struct object_id oid;
 
        /* cat-blob SP <object> LF */