Merge branch 'cc/apply' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2016 21:53:23 +0000 (14:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2016 21:53:23 +0000 (14:53 -0700)
commitb450a39beaedeb89f1e1830e2d6193c9d37b5f1b
tree4ac4ea3f8298835a7a0e8636989839e6c95c37cb
parentc75fb77d9af4c640ddebfe17bbf45e46bb2a68a8
parent7a6a44c2dc7a59ef8e117c2f1ea3c06ce6a6ff1f
Merge branch 'cc/apply' into maint

Minor code clean-up.

* cc/apply:
  builtin/apply: free patch when parse_chunk() fails
  builtin/apply: handle parse_binary() failure
  apply: remove unused call to free() in gitdiff_{old,new}name()
  builtin/apply: get rid of useless 'name' variable