Merge branch 'maint'

* maint: attr: fix leak in free_attr_elem t2203: fix wrong commit command
git-mirror · Jan 12, 2012 · 0e1cfc5 · 0e1cfc5
2 parents 7e52164 + 113e828
commit 0e1cfc5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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' '
-Original file line number
+Diff line change
@@ Expand Up / @@ -301,6 +301,7 @@ static void free_attr_elem(struct attr_stack *e) @@
     		}
     		free(a);
     	}
+    	free(e->attrs);
     	free(e);
     }
@@ Expand Down @@