summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-10-30 15:43:45 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-10-30 15:43:45 +0900
commit48542e3252d91b04c68097c5c2aff930a6ba7ece (patch)
treea722215eeb7f1ec86c0bb3df75c2253c8de2fbd2
parentMerge branch 'js/diff-notice-has-drive-prefix' (diff)
parentmulti-pack-index: avoid dead store for struct progress (diff)
downloadtgif-48542e3252d91b04c68097c5c2aff930a6ba7ece.tar.xz
Merge branch 'cb/remove-dead-init'
Code clean-up. * cb/remove-dead-init: multi-pack-index: avoid dead store for struct progress unpack-trees: avoid dead store for struct progress
-rw-r--r--midx.c2
-rw-r--r--unpack-trees.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/midx.c b/midx.c
index ea2f3ffe2e..4fac0cd08a 100644
--- a/midx.c
+++ b/midx.c
@@ -941,7 +941,7 @@ static void midx_report(const char *fmt, ...)
int verify_midx_file(const char *object_dir)
{
uint32_t i;
- struct progress *progress = NULL;
+ struct progress *progress;
struct multi_pack_index *m = load_multi_pack_index(object_dir, 1);
verify_midx_error = 0;
diff --git a/unpack-trees.c b/unpack-trees.c
index 51bfac6aa0..7570df481b 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -380,7 +380,7 @@ static int check_updates(struct unpack_trees_options *o)
{
unsigned cnt = 0;
int errs = 0;
- struct progress *progress = NULL;
+ struct progress *progress;
struct index_state *index = &o->result;
struct checkout state = CHECKOUT_INIT;
int i;