undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sb/blame-color' into jk/banned-function

Browse Source 
* sb/blame-color:
  blame: prefer xsnprintf to strcpy for colors
This commit is contained in:
Junio C Hamano 2018-07-20 14:42:53 -07:00
commit b20a3cbb88
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/blame.c
View File

@ -1071,7 +1071,9 @@ parse_done:
find_alignment(&sb, &output_option); find_alignment(&sb, &output_option);
if (!*repeated_meta_color && if (!*repeated_meta_color &&
(output_option & OUTPUT_COLOR_LINE)) (output_option & OUTPUT_COLOR_LINE))
strcpy(repeated_meta_color, GIT_COLOR_CYAN); xsnprintf(repeated_meta_color,
sizeof(repeated_meta_color),
"%s", GIT_COLOR_CYAN);
} }
if (output_option & OUTPUT_ANNOTATE_COMPAT) if (output_option & OUTPUT_ANNOTATE_COMPAT)
output_option &= ~(OUTPUT_COLOR_LINE | OUTPUT_SHOW_AGE_WITH_COLOR); output_option &= ~(OUTPUT_COLOR_LINE | OUTPUT_SHOW_AGE_WITH_COLOR);