aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-01-11 19:11:13 -0800
committerJunio C Hamano <gitster@pobox.com>2012-01-11 19:11:13 -0800
commit113e828d3893f31ef72dd8287e95da9fa2287110 (patch)
tree884273562e04329533af9f9b7bebc1e1ae907dd6
parentbe4d2920c24ba0be84ceff7e382cce2c5f1ad867 (diff)
parentafb6b561e3dad13df5d9df9731751a3d310c0854 (diff)
downloadgit-113e828d3893f31ef72dd8287e95da9fa2287110.tar.gz
git-113e828d3893f31ef72dd8287e95da9fa2287110.tar.xz
Merge branch 'maint-1.7.7' into maint
* maint-1.7.7: attr: fix leak in free_attr_elem t2203: fix wrong commit command
-rw-r--r--attr.c1
-rwxr-xr-xt/t2203-add-intent.sh2
2 files changed, 2 insertions, 1 deletions
diff --git a/attr.c b/attr.c
index 96eda0ef0..303751f6c 100644
--- a/attr.c
+++ b/attr.c
@@ -301,6 +301,7 @@ static void free_attr_elem(struct attr_stack *e)
}
free(a);
}
+ free(e->attrs);
free(e);
}
diff --git a/t/t2203-add-intent.sh b/t/t2203-add-intent.sh
index 58a329961..25435290a 100755
--- a/t/t2203-add-intent.sh
+++ b/t/t2203-add-intent.sh
@@ -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' '