diff options
| author | Stephen Kent <smkent@smkent.net> | 2017-04-21 22:42:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-04-28 11:50:52 +0900 |
| commit | 93fdf301de0daa57fd6a694ad4637ec7a3a1041c (patch) | |
| tree | 0dd9a364d094cbfb01a7edff145169fc7c41d3d3 /t/t7508-status.sh | |
| parent | 75177c8591aee23374c2ead9c9505ce989a8eec2 (diff) | |
| download | git-93fdf301de0daa57fd6a694ad4637ec7a3a1041c.tar.gz | |
status: add color config slots for branch info in "--short --branch"sk/status-short-branch-color-config
Add color config slots to be used in the status short-format when
displaying local and remote tracking branch information.
[jc: rebased on top of Peff's fix to 'git status' and tweaked the
test to check both local and remote-tracking branch output]
Signed-off-by: Stephen Kent <smkent@smkent.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7508-status.sh')
| -rwxr-xr-x | t/t7508-status.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/t/t7508-status.sh b/t/t7508-status.sh index a000ed4e7f..567c4d4bab 100755 --- a/t/t7508-status.sh +++ b/t/t7508-status.sh @@ -661,7 +661,9 @@ test_expect_success 'status --porcelain ignores relative paths setting' ' test_expect_success 'setup unique colors' ' git config status.color.untracked blue && - git config status.color.branch green + git config status.color.branch green && + git config status.color.localBranch yellow && + git config status.color.remoteBranch cyan ' @@ -730,7 +732,7 @@ test_expect_success 'status -s with color.status' ' ' cat >expect <<\EOF -## <GREEN>master<RESET>...<RED>upstream<RESET> [ahead <GREEN>1<RESET>, behind <RED>2<RESET>] +## <YELLOW>master<RESET>...<CYAN>upstream<RESET> [ahead <YELLOW>1<RESET>, behind <CYAN>2<RESET>] <RED>M<RESET> dir1/modified <GREEN>A<RESET> dir2/added <BLUE>??<RESET> dir1/untracked |