From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 25 May 2012 00:32:30 +0000 (-0700)
Subject: Merge branch 'jk/maint-status-porcelain-z-b' into maint
X-Git-Tag: v1.7.10.3~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a8bd582d3079e506c525fe1b735d6ea405576bff;p=git.git

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

"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
* jk/maint-status-porcelain-z-b:
  status: respect "-b" for porcelain format
  status: fix null termination with "-b"
  status: refactor null_termination option
  commit: refactor option parsing
---

a8bd582d3079e506c525fe1b735d6ea405576bff