Skip to content
Browse files

Merge branch 'maint-1.7.6' into maint-1.7.7

* maint-1.7.6:
  attr: fix leak in free_attr_elem
  t2203: fix wrong commit command
  • Loading branch information...
2 parents 804e97f + 37475f9 commit afb6b561e3dad13df5d9df9731751a3d310c0854 @gitster gitster committed Jan 11, 2012
Showing with 2 additions and 1 deletion.
  1. +1 −0 attr.c
  2. +1 −1 t/t2203-add-intent.sh
View
1 attr.c
@@ -301,6 +301,7 @@ static void free_attr_elem(struct attr_stack *e)
}
free(a);
}
+ free(e->attrs);
free(e);
}
View
2 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' '

0 comments on commit afb6b56

Please sign in to comment.
Something went wrong with that request. Please try again.