diff options
| author |   Junio C Hamano <gitster@pobox.com> | 2019-05-19 16:45:33 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-19 16:45:33 +0900 |
| commit | e0708c24d57b94b56b5556d05cc98f7ac5ba622b (patch) | |
| tree | e24276b2863e2717e76aeb289a462e6ca9662327 | |
| parent | Merge branch 'es/check-non-portable-pre-5.10' (diff) | |
| parent | status: fix display of rebase -ir's `label` command (diff) | |
| download | git-e0708c24d57b94b56b5556d05cc98f7ac5ba622b.tar.xz git-e0708c24d57b94b56b5556d05cc98f7ac5ba622b.zip | |
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
| -rw-r--r-- | wt-status.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/wt-status.c b/wt-status.c index e065558c312..d2a1bec226b 100644 --- a/wt-status.c +++ b/wt-status.c @@ -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); |