From: Junio C Hamano Date: Fri, 9 Sep 2016 04:49:50 +0000 (-0700) Subject: Merge branch 'jh/status-v2-porcelain' X-Git-Tag: v2.11.0-rc0~173 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/00d27937bf0348e7da615f04b65f535a58e096c1 Merge branch 'jh/status-v2-porcelain' Enhance "git status --porcelain" output by collecting more data on the state of the index and the working tree files, which may further be used to teach git-prompt (in contrib/) to make fewer calls to git. * jh/status-v2-porcelain: status: unit tests for --porcelain=v2 test-lib-functions.sh: add lf_to_nul helper git-status.txt: describe --porcelain=v2 format status: print branch info with --porcelain=v2 --branch status: print per-file porcelain v2 status data status: collect per-file data for --porcelain=v2 status: support --porcelain[=] status: cleanup API to wt_status_print status: rename long-format print routines --- 00d27937bf0348e7da615f04b65f535a58e096c1