Browse Source

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
maint
Junio C Hamano 6 years ago
parent
commit
e0708c24d5
  1. 4
      wt-status.c

4
wt-status.c

@ -1215,7 +1215,9 @@ static void abbrev_sha1_in_line(struct strbuf *line) @@ -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);

Loading…
Cancel
Save