From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 10 May 2012 17:49:46 +0000 (-0700)
Subject: Merge branch 'jk/status-porcelain-z-b'
X-Git-Tag: v1.7.11-rc0~42
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f7858ad1e1686ff65cc77989c49f13352934adbc;p=git.git

Merge branch 'jk/status-porcelain-z-b'

"git status --porcelain" ignored "--branch" option by mistake.  The output
for "git status --branch -z" was also incorrect and did not terminate the
record for the current branch name with NUL as asked.

By Jeff King
via Jeff King
* jk/status-porcelain-z-b:
  status: refactor colopts handling
  status: respect "-b" for porcelain format
  status: fix null termination with "-b"
  status: refactor null_termination option
  commit: refactor option parsing
---

f7858ad1e1686ff65cc77989c49f13352934adbc