summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-10-24 15:00:05 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-10-24 15:00:05 -0700
commit1758d236a253c10f34ae16cd2ae6d9c57eb312a7 (patch)
tree1fda16f5c560740260fe4593641b1b38d9861294
parentMerge branch 'eb/no-pthreads' (diff)
parentdir.c: remove the second declaration of "stk" in prep_exclude() (diff)
downloadtgif-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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/dir.c b/dir.c
index bd274a73f1..3f7a0256b6 100644
--- a/dir.c
+++ b/dir.c
@@ -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;