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()
This commit is contained in:
Junio C Hamano 2014-10-24 15:00:05 -07:00
commit 1758d236a2

2
dir.c
View File

@ -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;