Merge branch 'sb/misc-cleanup'
commit2bdd8727d75c29f535efbae2ed4067b7132aaa9a
authorJunio C Hamano <gitster@pobox.com>
Wed, 4 Sep 2013 19:36:30 +0000 (4 12:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 4 Sep 2013 19:36:30 +0000 (4 12:36 -0700)
treecf88d3c8120bfc89a900ae5f7a57ba8956435f66
parent05584b2a4e18e0693ac2af6dd9650e59351786ed
parentf8aae0b51743d5e5f35292caee41e5215b0e5bad
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