opensourcemirror
/
git
mirror of https://github.com/git/git.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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:
Junio C Hamano 2019-05-19 16:45:33 +09:00
parent dd5b7dc8ed 225a777af9
commit e0708c24d5
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wt-status.c
View File

@ -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);