Re: [PATCH] strbuf: use designated initializers in STRBUF_INIT
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jul 14, 2017, 19:16 UTC
- Message-ID
- <xmqq8tjqrfq4.fsf@gitster.mtv.corp.google.com>
- In-Reply-To
- <xmqqd192rh1t.fsf@gitster.mtv.corp.google.com>
Junio C Hamano <gitster@pobox.com> writes:
Show 5 quoted lines
> Do we need to have a check to detect a buggy compiler that takes the > syntax but produces an incorrectly initialized array? I could add a > test to ensure that HEADER comes out BOLD, etc. (or we may already > have such a test) and then reorder these lines in this patch, if > that is the kind of breakage we anticipate.
So here is a lunch-time hack I did to replace the patch I sent earlier. I kind of like the ordering of the elements better than the original, in that it somehow feels more logical, even though I merely sorted alphabetically ;-).
builtin/clean.c | 19 ++++++++++--------- t/t7301-clean-interactive.sh | 10 ++++++++++ 2 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/builtin/clean.c b/builtin/clean.c index 057fc97fe4..e2bb3c69ed 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -33,15 +33,6 @@ static const char *msg_skip_git_dir = N_("Skipping repository %s\n"); static const char *msg_would_skip_git_dir = N_("Would skip repository %s\n"); static const char *msg_warn_remove_failed = N_("failed to remove %s"); -static int clean_use_color = -1; -static char clean_colors[][COLOR_MAXLEN] = { - GIT_COLOR_RESET, - GIT_COLOR_NORMAL, /* PLAIN */ - GIT_COLOR_BOLD_BLUE, /* PROMPT */ - GIT_COLOR_BOLD, /* HEADER */ - GIT_COLOR_BOLD_RED, /* HELP */ - GIT_COLOR_BOLD_RED, /* ERROR */ -}; enum color_clean { CLEAN_COLOR_RESET = 0, CLEAN_COLOR_PLAIN = 1, @@ -51,6 +42,16 @@ enum color_clean { CLEAN_COLOR_ERROR = 5 }; +static int clean_use_color = -1; +static char clean_colors[][COLOR_MAXLEN] = { + [CLEAN_COLOR_ERROR] = GIT_COLOR_BOLD_RED, + [CLEAN_COLOR_HEADER] = GIT_COLOR_BOLD, + [CLEAN_COLOR_HELP] = GIT_COLOR_BOLD_RED, + [CLEAN_COLOR_PLAIN] = GIT_COLOR_NORMAL, + [CLEAN_COLOR_PROMPT] = GIT_COLOR_BOLD_BLUE, + [CLEAN_COLOR_RESET] = GIT_COLOR_RESET, +}; + #define MENU_OPTS_SINGLETON 01 #define MENU_OPTS_IMMEDIATE 02 #define MENU_OPTS_LIST_ONLY 04 diff --git a/t/t7301-clean-interactive.sh b/t/t7301-clean-interactive.sh index 3ae394e934..556e1850e2 100755 --- a/t/t7301-clean-interactive.sh +++ b/t/t7301-clean-interactive.sh @@ -472,4 +472,14 @@ test_expect_success 'git clean -id with prefix and path (ask)' ' ' +test_expect_success 'git clean -i paints the header in HEADER color' ' + >a.out && + echo q | + git -c color.ui=always clean -i | + test_decode_color | + head -n 1 >header && + # not i18ngrep + grep "^<BOLD>" header +' + test_done