Merge branch 'ep/varscope'
Shrink lifetime of variables by moving their definitions to an inner scope where appropriate. * ep/varscope: builtin/gc.c: reduce scope of variables builtin/fetch.c: reduce scope of variable builtin/commit.c: reduce scope of variables builtin/clean.c: reduce scope of variable builtin/blame.c: reduce scope of variables builtin/apply.c: reduce scope of variables bisect.c: reduce scope of variable
This commit is contained in:
@ -154,7 +154,7 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
|
||||
DIR *dir;
|
||||
struct strbuf quoted = STRBUF_INIT;
|
||||
struct dirent *e;
|
||||
int res = 0, ret = 0, gone = 1, original_len = path->len, len, i;
|
||||
int res = 0, ret = 0, gone = 1, original_len = path->len, len;
|
||||
unsigned char submodule_head[20];
|
||||
struct string_list dels = STRING_LIST_INIT_DUP;
|
||||
|
||||
@ -242,6 +242,7 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
|
||||
}
|
||||
|
||||
if (!*dir_gone && !quiet) {
|
||||
int i;
|
||||
for (i = 0; i < dels.nr; i++)
|
||||
printf(dry_run ? _(msg_would_remove) : _(msg_remove), dels.items[i].string);
|
||||
}
|
||||
|
Reference in New Issue
Block a user