summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-08-08 21:48:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-08-08 21:48:42 (GMT)
commit3a3338d373d10fc2699b4ad26a84992d284f3266 (patch)
tree5acac358d96a57ec80cb822d229d19933ccebfb1 /t
parent940622bc8b33e085f62c5bcfe6183fe6f57888e2 (diff)
parenta903e233f65a3e93cad74007cc0d5a178f712263 (diff)
downloadgit-3a3338d373d10fc2699b4ad26a84992d284f3266.zip
git-3a3338d373d10fc2699b4ad26a84992d284f3266.tar.gz
git-3a3338d373d10fc2699b4ad26a84992d284f3266.tar.bz2
Merge branch 'nd/log-decorate-color-head-arrow'
An entry "git log --decorate" for the tip of the current branch is shown as "HEAD -> name" (where "name" is the name of the branch); paint the arrow in the same color as "HEAD", not in the color for commits. * nd/log-decorate-color-head-arrow: log: decorate HEAD -> branch with the same color for arrow and HEAD
Diffstat (limited to 't')
-rwxr-xr-xt/t4207-log-decoration-colors.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4207-log-decoration-colors.sh b/t/t4207-log-decoration-colors.sh
index f8008b6..b972296 100755
--- a/t/t4207-log-decoration-colors.sh
+++ b/t/t4207-log-decoration-colors.sh
@@ -44,7 +44,7 @@ test_expect_success setup '
'
cat >expected <<EOF
-${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}${c_HEAD}HEAD${c_reset}${c_commit} ->\
+${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}${c_HEAD}HEAD ->\
${c_reset}${c_branch}master${c_reset}${c_commit},\
${c_reset}${c_tag}tag: v1.0${c_reset}${c_commit},\
${c_reset}${c_tag}tag: B${c_reset}${c_commit})${c_reset} B