mirror of
https://github.com/git/git.git
synced 2024-11-24 02:17:02 +08:00
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:
commit
1758d236a2
2
dir.c
2
dir.c
@ -826,9 +826,9 @@ static void prep_exclude(struct dir_struct *dir, const char *base, int baselen)
|
|||||||
current = stk ? stk->baselen : -1;
|
current = stk ? stk->baselen : -1;
|
||||||
strbuf_setlen(&dir->basebuf, current < 0 ? 0 : current);
|
strbuf_setlen(&dir->basebuf, current < 0 ? 0 : current);
|
||||||
while (current < baselen) {
|
while (current < baselen) {
|
||||||
struct exclude_stack *stk = xcalloc(1, sizeof(*stk));
|
|
||||||
const char *cp;
|
const char *cp;
|
||||||
|
|
||||||
|
stk = xcalloc(1, sizeof(*stk));
|
||||||
if (current < 0) {
|
if (current < 0) {
|
||||||
cp = base;
|
cp = base;
|
||||||
current = 0;
|
current = 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user