mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-23 12:36:09 +02:00
Code

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
parent e4da4fbe0e 03e11a715b
commit 1758d236a2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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;