undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint-1.7.6' into maint-1.7.7

Browse Source 
* maint-1.7.6:
  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:00 -08:00
commit afb6b561e3
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
attr.c
View File

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

2
t/t2203-add-intent.sh
View File

@ -41,7 +41,7 @@ test_expect_success 'cannot commit with i-t-a entry' '
echo frotz >nitfol && echo frotz >nitfol &&
git add rezrov && git add rezrov &&
git add -N nitfol && 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' ' test_expect_success 'can commit with an unrelated i-t-a entry in index' '