From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 19 May 2019 07:45:33 +0000 (+0900)
Subject: Merge branch 'js/rebase-i-label-shown-in-status-fix'
X-Git-Tag: v2.22.0-rc1~9
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e0708c24d57b94b56b5556d05cc98f7ac5ba622b?hp=dd5b7dc8ed2d02a693411aaae98f97d42c7a536c

Merge branch 'js/rebase-i-label-shown-in-status-fix'

"git status" did not know that the "label" instruction in the
todo-list "rebase -i -r" uses should not be shown as a hex object
name.

* js/rebase-i-label-shown-in-status-fix:
status: fix display of rebase -ir's `label` command
---

diff --git a/wt-status.c b/wt-status.c
index e065558c31..d2a1bec226 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -1215,7 +1215,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);