update-index: move 'uc' var declaration
Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
6d19db1491
commit
e7c0c5354b
@ -1116,8 +1116,6 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
|
|||||||
the_index.cache_changed |= SOMETHING_CHANGED;
|
the_index.cache_changed |= SOMETHING_CHANGED;
|
||||||
}
|
}
|
||||||
if (untracked_cache > UC_DISABLE) {
|
if (untracked_cache > UC_DISABLE) {
|
||||||
struct untracked_cache *uc;
|
|
||||||
|
|
||||||
if (untracked_cache < UC_FORCE) {
|
if (untracked_cache < UC_FORCE) {
|
||||||
setup_work_tree();
|
setup_work_tree();
|
||||||
if (!test_if_untracked_cache_is_supported())
|
if (!test_if_untracked_cache_is_supported())
|
||||||
@ -1126,7 +1124,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
if (!the_index.untracked) {
|
if (!the_index.untracked) {
|
||||||
uc = xcalloc(1, sizeof(*uc));
|
struct untracked_cache *uc = xcalloc(1, sizeof(*uc));
|
||||||
strbuf_init(&uc->ident, 100);
|
strbuf_init(&uc->ident, 100);
|
||||||
uc->exclude_per_dir = ".gitignore";
|
uc->exclude_per_dir = ".gitignore";
|
||||||
/* should be the same flags used by git-status */
|
/* should be the same flags used by git-status */
|
||||||
|
Reference in New Issue
Block a user