Re: [PATCH v5 3/4] status: give more information during rebase -i

> Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:
>
>> Actually, we can do simpler: we still have the original line available,
>> ...
>>
>> I took this (modulo s/line.len[0]/line.buf[0]/, and s/rtrim/trim/ to be
>> robust to leading whitespace (not really important, but doesn't harm).
>
> I'd prefer us to be more strict when we know we are reading our own
> output; rtrim is sensible, as the log line has end-user subject
> the end and the subject might have a trailing whitespace we want to
> trim, but there is no valid reason to expect leading whitespace.

> --- a/wt-status.c
> +++ b/wt-status.c
> @@ -1046,12 +1046,8 @@ static void abbrev_sha1_in_line(struct strbuf *line)
>                 unsigned char sha1[20];
>                 const char *abbrev;
>  
> -               /*
> -                * strbuf_split_max left a space. Trim it and re-add
> -                * it after abbreviation.
> -                */
> -               strbuf_trim(split[1]);
> -               if (!get_sha1(split[1]->buf, sha1)) {
> +               if (!get_sha1_hex(split[1]->buf, sha1) &&
> +                   !strcmp(split[1]->buf + 40, " ")) {
>                         abbrev = find_unique_abbrev(sha1, DEFAULT_ABBREV);
>                         strbuf_reset(split[1]);
>                         strbuf_addf(split[1], "%s ", abbrev);