From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 22 Dec 2011 23:30:33 +0000 (-0800)
Subject: Merge branch 'ab/sun-studio-portability'
X-Git-Tag: v1.7.9-rc0~13
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=35726681d5fd6bde44a18b4aec3cf04258d0b44e;p=git.git

Merge branch 'ab/sun-studio-portability'

* ab/sun-studio-portability:
  Appease Sun Studio by renaming "tmpfile"
  Fix a bitwise negation assignment issue spotted by Sun Studio
  Fix an enum assignment issue spotted by Sun Studio
---

35726681d5fd6bde44a18b4aec3cf04258d0b44e