mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
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
This commit is contained in:
commit
e0708c24d5
|
@ -1215,7 +1215,9 @@ static void abbrev_sha1_in_line(struct strbuf *line)
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if (starts_with(line->buf, "exec ") ||
|
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;
|
return;
|
||||||
|
|
||||||
split = strbuf_split_max(line, ' ', 3);
|
split = strbuf_split_max(line, ' ', 3);
|
||||||
|
|
Loading…
Reference in a new issue