diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-07-16 17:42:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-07-16 17:42:53 -0700 |
| commit | bd4232fac3319890429ec303e2f7c3d287c8eaa3 (patch) | |
| tree | b5032aca9cdafb5812801f2868cabddc23e2052a /wt-status.c | |
| parent | 832a239b72779e97b09943d77b9097ed8376e18e (diff) | |
| parent | bc40dfb10a06612813a3f9b733d65af0732208b2 (diff) | |
| download | git-bd4232fac3319890429ec303e2f7c3d287c8eaa3.tar.xz | |
Merge branch 'ab/struct-init'
Code cleanup around struct_type_init() functions.
* ab/struct-init:
string-list.h users: change to use *_{nodup,dup}()
string-list.[ch]: add a string_list_init_{nodup,dup}()
dir.[ch]: replace dir_init() with DIR_INIT
*.c *_init(): define in terms of corresponding *_INIT macro
*.h: move some *_INIT to designated initializers
Diffstat (limited to 'wt-status.c')
| -rw-r--r-- | wt-status.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/wt-status.c b/wt-status.c index 42b6735716..b5a3e1cc25 100644 --- a/wt-status.c +++ b/wt-status.c @@ -699,14 +699,13 @@ static void wt_status_collect_changes_initial(struct wt_status *s) static void wt_status_collect_untracked(struct wt_status *s) { int i; - struct dir_struct dir; + struct dir_struct dir = DIR_INIT; uint64_t t_begin = getnanotime(); struct index_state *istate = s->repo->index; if (!s->show_untracked_files) return; - dir_init(&dir); if (s->show_untracked_files != SHOW_ALL_UNTRACKED_FILES) dir.flags |= DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES; |