From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 4 Sep 2013 19:36:30 +0000 (-0700)
Subject: Merge branch 'sb/misc-cleanup'
X-Git-Tag: v1.8.5-rc0~186
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2bdd8727d75c29f535efbae2ed4067b7132aaa9a

Merge branch 'sb/misc-cleanup'

* sb/misc-cleanup:
rm: remove unneeded null pointer check
diff: fix a possible null pointer dereference
diff: remove ternary operator evaluating always to true
---

2bdd8727d75c29f535efbae2ed4067b7132aaa9a