Skip to content

Commit

Permalink
Merge branch 'maint-1.7.7' into maint
Browse files Browse the repository at this point in the history
* maint-1.7.7:
  attr: fix leak in free_attr_elem
  t2203: fix wrong commit command
  • Loading branch information
Junio C Hamano committed Jan 12, 2012
2 parents be4d292 + afb6b56 commit 113e828
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions attr.c
Original file line number Diff 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
2 changes: 1 addition & 1 deletion t/t2203-add-intent.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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' '
Expand Down

0 comments on commit 113e828

Please sign in to comment.