Merge branch 'jk/status-read-branch-name-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Feb 2015 06:10:21 +0000 (22:10 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Feb 2015 06:10:22 +0000 (22:10 -0800)
commit93baadb138846320e049999c551ed02020662e3f
tree120c88bade1489d0de1704816220af2dfd3b3284
parent2fc85f05452087298023519cf95e04c9343ec69d
parent66ec904b4e5779c2ffd68d3bb8071cc15b2287c7
Merge branch 'jk/status-read-branch-name-fix' into maint

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