Merge branch 'jk/status-read-branch-name-fix' into next
commit1af96a93361d84a3b7ca8497fab0a7f140ee5c9c
authorJunio C Hamano <gitster@pobox.com>
Thu, 12 Feb 2015 21:56:59 +0000 (12 13:56 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 12 Feb 2015 21:56:59 +0000 (12 13:56 -0800)
treefdb6cad982fd40627af93d18d9f17e0c3a6b16b1
parent669040dc6ccc7e48a2ecdabcfa1f1a04230c87f5
parent66ec904b4e5779c2ffd68d3bb8071cc15b2287c7
Merge branch 'jk/status-read-branch-name-fix' into next

Code to read branch name from various files in .git/ directory
would have misbehaved if the code to write them left an empty file.

* jk/status-read-branch-name-fix:
  read_and_strip_branch: fix typo'd address-of operator
wt-status.c