sideband: color lines with keyword only

When bf1a11f0a1 (sideband: highlight keywords in remote sideband output,
2018-08-07) was introduced, it was carefully considered which strings
would be highlighted. However 59a255aef0 (sideband: do not read beyond
the end of input, 2018-08-18) brought in a regression that the original
did not test for. A line containing only the keyword and nothing else
("SUCCESS") should still be colored.

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/sideband.c b/sideband.c
index 368647acf8c04decee14ceea2f03c535a206ad18..7c3d33d3f87965fc96720ad47674a81a804f43dd 100644 (file)
--- a/sideband.c
+++ b/sideband.c
@@ -87,7 +87,7 @@ static void maybe_colorize_sideband(struct strbuf *dest, const char *src, int n)
                struct keyword_entry *p = keywords + i;
                int len = strlen(p->keyword);
 
                struct keyword_entry *p = keywords + i;
                int len = strlen(p->keyword);
 

-               if (n <= len)
+               if (n < len)

                        continue;
                /*
                 * Match case insensitively, so we colorize output from existing
                        continue;
                /*
                 * Match case insensitively, so we colorize output from existing


@@ -95,7 +95,8 @@ static void maybe_colorize_sideband(struct strbuf *dest, const char *src, int n)
                 * messages. We only highlight the word precisely, so
                 * "successful" stays uncolored.
                 */
                 * messages. We only highlight the word precisely, so
                 * "successful" stays uncolored.
                 */

-               if (!strncasecmp(p->keyword, src, len) && !isalnum(src[len])) {
+               if (!strncasecmp(p->keyword, src, len) &&
+                   (len == n || !isalnum(src[len]))) {

                        strbuf_addstr(dest, p->color);
                        strbuf_add(dest, src, len);
                        strbuf_addstr(dest, GIT_COLOR_RESET);
                        strbuf_addstr(dest, p->color);
                        strbuf_add(dest, src, len);
                        strbuf_addstr(dest, GIT_COLOR_RESET);

diff --git a/t/t5409-colorize-remote-messages.sh b/t/t5409-colorize-remote-messages.sh
index f81b6813c03090fe932852f86ce4b3517c914d7a..2a8c4496618523ebdbd03eb152a1e8189fafcd0a 100755 (executable)
--- a/t/t5409-colorize-remote-messages.sh
+++ b/t/t5409-colorize-remote-messages.sh
@@ -17,6 +17,7 @@ test_expect_success 'setup' '
        echo " " "error: leading space"
        echo "    "
        echo Err
        echo " " "error: leading space"
        echo "    "
        echo Err

+       echo SUCCESS

        exit 0
        EOF
        echo 1 >file &&
        exit 0
        EOF
        echo 1 >file &&


@@ -35,6 +36,7 @@ test_expect_success 'keywords' '
        grep "<BOLD;RED>error<RESET>: error" decoded &&
        grep "<YELLOW>hint<RESET>:" decoded &&
        grep "<BOLD;GREEN>success<RESET>:" decoded &&
        grep "<BOLD;RED>error<RESET>: error" decoded &&
        grep "<YELLOW>hint<RESET>:" decoded &&
        grep "<BOLD;GREEN>success<RESET>:" decoded &&

+       grep "<BOLD;GREEN>SUCCESS<RESET>" decoded &&

        grep "<BOLD;YELLOW>warning<RESET>:" decoded
 '
 
        grep "<BOLD;YELLOW>warning<RESET>:" decoded
 '