Merge branch 'maint'

* maint:
  attr: fix leak in free_attr_elem
  t2203: fix wrong commit command
This commit is contained in:
Junio C Hamano 2012-01-11 19:11:28 -08:00
commit 0e1cfc52de
2 changed files with 2 additions and 1 deletions

1
attr.c
View file

@ -301,6 +301,7 @@ static void free_attr_elem(struct attr_stack *e)
}
free(a);
}
free(e->attrs);
free(e);
}

View file

@ -41,7 +41,7 @@ test_expect_success 'cannot commit with i-t-a entry' '
echo frotz >nitfol &&
git add rezrov &&
git add -N nitfol &&
test_must_fail git commit
test_must_fail git commit -m initial
'
test_expect_success 'can commit with an unrelated i-t-a entry in index' '