diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-10-24 15:00:05 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-10-24 15:00:05 -0700 |
commit | 1758d236a253c10f34ae16cd2ae6d9c57eb312a7 (patch) | |
tree | 1fda16f5c560740260fe4593641b1b38d9861294 | |
parent | Merge branch 'eb/no-pthreads' (diff) | |
parent | dir.c: remove the second declaration of "stk" in prep_exclude() (diff) | |
download | tgif-1758d236a253c10f34ae16cd2ae6d9c57eb312a7.tar.xz |
Merge branch 'nd/dir-prep-exclude-cleanup'
Code clean-up.
* nd/dir-prep-exclude-cleanup:
dir.c: remove the second declaration of "stk" in prep_exclude()
-rw-r--r-- | dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -826,9 +826,9 @@ static void prep_exclude(struct dir_struct *dir, const char *base, int baselen) current = stk ? stk->baselen : -1; strbuf_setlen(&dir->basebuf, current < 0 ? 0 : current); while (current < baselen) { - struct exclude_stack *stk = xcalloc(1, sizeof(*stk)); const char *cp; + stk = xcalloc(1, sizeof(*stk)); if (current < 0) { cp = base; current = 0; |