From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Tue, 21 Oct 2014 11:38:06 +0000 (+0700)
Subject: dir.c: remove the second declaration of "stk" in prep_exclude()
X-Git-Tag: v2.2.0-rc0~18^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=03e11a715bffb0715ebcc9d6370aac7b968b3a4a;p=thirdparty%2Fgit.git

dir.c: remove the second declaration of "stk" in prep_exclude()

This "stk" shadows the first declaration at the top. There's currently
no bad effect. But let's avoid it.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/dir.c b/dir.c
index 797805d6a1..c2a1c87f49 100644
--- a/dir.c
+++ b/dir.c
@@ -816,9 +816,9 @@ static void prep_exclude(struct dir_struct *dir, const char *base, int baselen)
 	/* Read from the parent directories and push them down. */
 	current = stk ? stk->baselen : -1;
 	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;