Merge branch 'cc/apply'
commit5b3b015999e4b31259404c5e91c19c08780585a3
authorJunio C Hamano <gitster@pobox.com>
Wed, 13 Apr 2016 21:12:34 +0000 (13 14:12 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 13 Apr 2016 21:12:34 +0000 (13 14:12 -0700)
treee3e02637aa85ac8c77cff6281421fcb6581ff4f8
parentfc452aeac2d5d357de2904aebee8d3867f92705c
parent7a6a44c2dc7a59ef8e117c2f1ea3c06ce6a6ff1f
Merge branch 'cc/apply'

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
builtin/apply.c