提交 e0708c24 编写于 作者: J Junio C Hamano

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
......@@ -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);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册