Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-12-16 23:50:03 +0300
committerJunio C Hamano <gitster@pobox.com>2010-12-16 23:50:03 +0300
commitf68b780b2575628eca75e9502e4997f98ad2af3b (patch)
tree885194f0e88689e63ad9aa154485f795f1dc0ba3 /t/t7508-status.sh
parentb932c3c1c16844af9af2b71790caaca30546e99e (diff)
parent148135fc24dce1e61cfd7fcedea4210095099e78 (diff)
Merge branch 'aa/status-hilite-branch'
* aa/status-hilite-branch: default color.status.branch to "same as header" status: show branchname with a configurable color
Diffstat (limited to 't/t7508-status.sh')
-rwxr-xr-xt/t7508-status.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/t/t7508-status.sh b/t/t7508-status.sh
index b73ab42936..f1dc5c3b6a 100755
--- a/t/t7508-status.sh
+++ b/t/t7508-status.sh
@@ -405,12 +405,13 @@ 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.untracked blue &&
+ git config status.color.branch green
'
cat >expect <<\EOF
-# On branch master
+# On branch <GREEN>master<RESET>
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#