diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-10-30 15:43:45 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-10-30 15:43:45 +0900 |
commit | 48542e3252d91b04c68097c5c2aff930a6ba7ece (patch) | |
tree | a722215eeb7f1ec86c0bb3df75c2253c8de2fbd2 | |
parent | Merge branch 'js/diff-notice-has-drive-prefix' (diff) | |
parent | multi-pack-index: avoid dead store for struct progress (diff) | |
download | tgif-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.c | 2 | ||||
-rw-r--r-- | unpack-trees.c | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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; |