t6044: verify that merges expected to abort actually abort

diff --git a/fast-import.c b/fast-import.c
index 58ef360da43d3d7d55733cb8ee66014351814921..b5db5d20b1b20c642cf97f990eb538ee6fbaa299 100644 (file)
--- a/fast-import.c
+++ b/fast-import.c
@@ -3005,7 +3005,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 */
@@ -3022,7 +3022,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 */