Skip to content

Commit e0708c2

Browse files
committed
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
2 parents dd5b7dc + 225a777 commit e0708c2

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

wt-status.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1215,7 +1215,9 @@ static void abbrev_sha1_in_line(struct strbuf *line)
12151215
int i;
12161216

12171217
if (starts_with(line->buf, "exec ") ||
1218-
starts_with(line->buf, "x "))
1218+
starts_with(line->buf, "x ") ||
1219+
starts_with(line->buf, "label ") ||
1220+
starts_with(line->buf, "l "))
12191221
return;
12201222

12211223
split = strbuf_split_max(line, ' ', 3);

0 commit comments

Comments
 (0)