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 e065558c312eefb4c3d5f8bf91dd8358069e0faa..d2a1bec226ba0dfef9e3ddd96c0b3a83ea6884bb 100644 (file)
--- 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);