diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-05-10 13:23:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-13 15:38:21 +0900 |
| commit | 225a777af9b802e1f8516031b5fbf08e4d5cb48a (patch) | |
| tree | a570b97bac0bd80f7c0ce28a2a698dfe8f27d36f | |
| parent | The eighth batch (diff) | |
| download | git-225a777af9b802e1f8516031b5fbf08e4d5cb48a.tar.gz git-225a777af9b802e1f8516031b5fbf08e4d5cb48a.zip | |
status: fix display of rebase -ir's `label` command
The argument of a `label` command does *not* want to be turned into an
abbreviated SHA-1.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -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 f4fa982638..f9fba796fb 100644 --- a/wt-status.c +++ b/wt-status.c @@ -1214,7 +1214,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); |