diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2016-07-09 14:49:49 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-12 15:08:26 -0700 |
| commit | a903e233f65a3e93cad74007cc0d5a178f712263 (patch) | |
| tree | 7903bb6521141f5b8469ad72b6a8f8120279a3d1 | |
| parent | e568e563ade00bbb0937162f405fc160f253e224 (diff) | |
| download | git-nd/log-decorate-color-head-arrow.tar.gz | |
log: decorate HEAD -> branch with the same color for arrow and HEADnd/log-decorate-color-head-arrow
Commit 76c61fb (log: decorate HEAD with branch name under
--decorate=full, too - 2015-05-13) adds "HEAD -> branch" decoration to
show current branch vs detached HEAD. The sign of whether HEAD is
detached or not is "->" (vs ",") because the branch is always colored
by type. Color the arrow the same as HEAD to visually emphasize that
the following branch is HEAD, without paying too much attention to the
actual separators "->" or ","
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | log-tree.c | 2 | ||||
| -rwxr-xr-x | t/t4207-log-decoration-colors.sh | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/log-tree.c b/log-tree.c index 01beb11f65..c70f992a96 100644 --- a/log-tree.c +++ b/log-tree.c @@ -263,8 +263,6 @@ void format_decorations_extended(struct strbuf *sb, if (current_and_HEAD && decoration->type == DECORATION_REF_HEAD) { - strbuf_addstr(sb, color_reset); - strbuf_addstr(sb, color_commit); strbuf_addstr(sb, " -> "); strbuf_addstr(sb, color_reset); strbuf_addstr(sb, decorate_get_color(use_color, current_and_HEAD->type)); diff --git a/t/t4207-log-decoration-colors.sh b/t/t4207-log-decoration-colors.sh index f8008b6a3d..b972296f06 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 |