Code

Merge branch 'bc/maint-status-z-to-use-porcelain'
authorJunio C Hamano <gitster@pobox.com>
Mon, 6 Jun 2011 18:40:08 +0000 (11:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Jun 2011 18:40:08 +0000 (11:40 -0700)
commit6c92972d7f5ab247a8cab5e4b88cb281bf201970
tree2a5100a10d4b91a59dea75ef73184142479c8963
parenta6605d76cdad37ed3c55a7be4d2e0af0f4721bb2
parent000f97bd11e94fa8ede7fcdb43f5633997fed672
Merge branch 'bc/maint-status-z-to-use-porcelain'

* bc/maint-status-z-to-use-porcelain:
  builtin/commit.c: set status_format _after_ option parsing
  t7508: demonstrate status's failure to use --porcelain format with -z

Conflicts:
builtin/commit.c
builtin/commit.c
t/t7508-status.sh