summaryrefslogtreecommitdiffstats
path: root/fast-import.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-03-21 19:30:15 +0100
committerJunio C Hamano <gitster@pobox.com>2018-03-21 19:30:15 +0100
commitd17811154b2482bae3fd089f29528e7b7b7ce62b (patch)
tree2cfe574ab7b61341efe6666744e85e6ac75da3af /fast-import.c
parentMerge branch 'tz/complete-tag-delete-tagname' (diff)
parentread-cache: fix an -Wmaybe-uninitialized warning (diff)
downloadgit-d17811154b2482bae3fd089f29528e7b7b7ce62b.tar.xz
git-d17811154b2482bae3fd089f29528e7b7b7ce62b.zip
Merge branch 'rj/warning-uninitialized-fix'
Compilation fix. * rj/warning-uninitialized-fix: read-cache: fix an -Wmaybe-uninitialized warning -Wuninitialized: remove some 'init-self' workarounds
Diffstat (limited to 'fast-import.c')
-rw-r--r--fast-import.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fast-import.c b/fast-import.c
index 58ef360da4..b5db5d20b1 100644
--- 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 */