commit e0708c24d57b94b56b5556d05cc98f7ac5ba622b
author Junio C Hamano <gitster@pobox.com> Sun May 19 16:45:33 2019 +0900
committer Junio C Hamano <gitster@pobox.com> Sun May 19 16:45:33 2019 +0900
tree e24276b2863e2717e76aeb289a462e6ca9662327
parent dd5b7dc8ed2d02a693411aaae98f97d42c7a536c
parent 225a777af9b802e1f8516031b5fbf08e4d5cb48a

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

wt-status.c

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