path: root/t/
diff options
authorStephen Kent <>2017-04-22 05:42:02 (GMT)
committerJunio C Hamano <>2017-04-28 02:50:52 (GMT)
commit93fdf301de0daa57fd6a694ad4637ec7a3a1041c (patch)
tree0dd9a364d094cbfb01a7edff145169fc7c41d3d3 /t/
parent75177c8591aee23374c2ead9c9505ce989a8eec2 (diff)
status: add color config slots for branch info in "--short --branch"
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 <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 't/')
1 files changed, 4 insertions, 2 deletions
diff --git a/t/ b/t/
index a000ed4..567c4d4 100755
--- a/t/
+++ b/t/
@@ -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