René Scharfe <l.s.r@xxxxxx> writes:
> diff --git a/wt-status.c b/wt-status.c
> index 435fc28..ced53dd 100644
> --- a/wt-status.c
> +++ b/wt-status.c
> @@ -1317,15 +1317,14 @@ static int grab_1st_switch(unsigned char *osha1, unsigned char *nsha1,
> target += strlen(" to ");
> strbuf_reset(&cb->buf);
> hashcpy(cb->nsha1, nsha1);
> - for (end = target; *end && *end != '\n'; end++)
> - ;
> - if (!memcmp(target, "HEAD", end - target)) {
> + end = strchrnul(target, '\n');
> + strbuf_add(&cb->buf, target, end - target);
> + if (!strcmp(cb->buf.buf, "HEAD")) {
> /* HEAD is relative. Resolve it to the right reflog entry. */
> + strbuf_reset(&cb->buf);
> strbuf_addstr(&cb->buf,
> find_unique_abbrev(nsha1, DEFAULT_ABBREV));
> - return 1;
> }
> - strbuf_add(&cb->buf, target, end - target);
> return 1;
> }
Indeed, the code is much simpler like this than with the previous
attempts. Looks all right to me.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html