status: fix display of rebase -ir's `label` command
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Fri, 10 May 2019 20:23:14 +0000 (13:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 May 2019 06:38:21 +0000 (15:38 +0900)
The argument of a `label` command does *not* want to be turned into an
abbreviated SHA-1.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
wt-status.c
index f4fa98263857015b3d86e05df42e59591e74109a..f9fba796fb31275076c8c52d1e06195b9858ad6a 100644 (file)
@@ -1214,7 +1214,9 @@ static void abbrev_sha1_in_line(struct strbuf *line)
        int i;
 
        if (starts_with(line->buf, "exec ") ||
-           starts_with(line->buf, "x "))
+           starts_with(line->buf, "x ") ||
+           starts_with(line->buf, "label ") ||
+           starts_with(line->buf, "l "))
                return;
 
        split = strbuf_split_max(line, ' ', 3);