Re: [PATCH v15 07/13] ref-filter: add support for %(contents:lines=X)

From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: Karthik Nayak <karthik.188@gmail.com>
Cc: Git <git@vger.kernel.org>,
	Christian Couder <christian.couder@gmail.com>,
	Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v15 07/13] ref-filter: add support for %(contents:lines=X)
Date: Thu, 03 Sep 2015 16:47:19 +0200	[thread overview]
Message-ID: <vpq8u8nh85k.fsf@anie.imag.fr> (raw)
In-Reply-To: <CAOLa=ZRSbixzcNyF_s2E+oHMJsG7SuKizb5WHHk5Dmj-OKEetw@mail.gmail.com> (Karthik Nayak's message of "Thu, 3 Sep 2015 19:19:03 +0530")

Karthik Nayak <karthik.188@gmail.com> writes:

> On Thu, Sep 3, 2015 at 7:04 PM, Karthik Nayak <karthik.188@gmail.com> wrote:
>>>                         struct strbuf s = STRBUF_INIT;
>>>                         if (strtoul_ui(valp, 10, &v->u.contents.lines))
>>>                                 die(_("positive width expected contents:lines=%s"), valp);
>>> -                       append_lines(&s, subpos, sublen + bodylen - siglen, v->u.contents.lines);
>>> +                       append_lines(&s, subpos, bodypos + bodylen - subpos, v->u.contents.lines);
>>>                         v->s = strbuf_detach(&s, NULL);
>>>                 }
>>>         }
>
> append_lines(&s, subpos, bodylen + bodypos - subpos - siglen,
> v->u.contents.lines);
>
> We need to eliminate the signature if existing also.

Indeed. I thought body did not include the signature.

I'd write it as

  bodylen + bodypos - siglen - subpos

or even

  char *contents_end = bodylen + bodypos - siglen;
  ...
  append_lines(&s, subpos, contents_end - subpos, ...);

to make it self-explanatory.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/