1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-01 14:57:52 +01:00

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
This commit is contained in:
Junio C Hamano 2018-10-30 15:43:45 +09:00
commit 48542e3252
2 changed files with 2 additions and 2 deletions

2
midx.c
View file

@ -941,7 +941,7 @@ static void midx_report(const char *fmt, ...)
int verify_midx_file(const char *object_dir) int verify_midx_file(const char *object_dir)
{ {
uint32_t i; uint32_t i;
struct progress *progress = NULL; struct progress *progress;
struct multi_pack_index *m = load_multi_pack_index(object_dir, 1); struct multi_pack_index *m = load_multi_pack_index(object_dir, 1);
verify_midx_error = 0; verify_midx_error = 0;

View file

@ -380,7 +380,7 @@ static int check_updates(struct unpack_trees_options *o)
{ {
unsigned cnt = 0; unsigned cnt = 0;
int errs = 0; int errs = 0;
struct progress *progress = NULL; struct progress *progress;
struct index_state *index = &o->result; struct index_state *index = &o->result;
struct checkout state = CHECKOUT_INIT; struct checkout state = CHECKOUT_INIT;
int i; int i;