Merge branch 'maint-1.7.6' into maint-1.7.7

gitster · gitster · commit afb6b561e3da · 2012-01-11T19:11:00.000-08:00
* maint-1.7.6:
  attr: fix leak in free_attr_elem
  t2203: fix wrong commit command
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 number	Diff line change
`@@ -301,6 +301,7 @@ static void free_attr_elem(struct attr_stack *e)`
`301`	`301`	`}`
`302`	`302`	`free(a);`
`303`	`303`	`}`
	`304`	`+ free(e->attrs);`
`304`	`305`	`free(e);`
`305`	`306`	`}`
`306`	`307`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ test_expect_success 'cannot commit with i-t-a entry' '`
`41`	`41`	`echo frotz >nitfol &&`
`42`	`42`	`git add rezrov &&`
`43`	`43`	`git add -N nitfol &&`
`44`		`- test_must_fail git commit`
	`44`	`+ test_must_fail git commit -m initial`
`45`	`45`	`'`
`46`	`46`
`47`	`47`	`test_expect_success 'can commit with an unrelated i-t-a entry in index' '`