From: Philip Oakley <philipoakley@iee.org>
Date: Sat, 18 Jul 2015 08:24:04 GMT
Subject: Re: [PATCH v3 06/18] rerere: drop want_sp parameter from is_cmarker()
Message-ID: <3AAC96959AB14E61B7711B914D963B7F@PhilipOakley>
In-Reply-To: <1437171880-21590-7-git-send-email-gitster@pobox.com>

From: "Junio C Hamano" <gitster@pobox.com>
> As the nature of the conflict marker line determies if there should

"should be a"?
i.e. s/a /be a /    below

> a SP and label after it, the caller shouldn't have to pass the
> parameter redundantly.
>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
> rerere.c | 27 ++++++++++++++++++++++-----
> 1 file changed, 22 insertions(+), 5 deletions(-)
>
> diff --git a/rerere.c b/rerere.c
> index 304df02..4c45f55 100644
> --- a/rerere.c
> +++ b/rerere.c
> @@ -148,8 +148,25 @@ static int rerere_file_getline(struct strbuf *sb, 
> struct rerere_io *io_)
>  return strbuf_getwholeline(sb, io->input, '\n');
> }
>
> -static int is_cmarker(char *buf, int marker_char, int marker_size, 
> int want_sp)
> +/*
> + * Require the exact number of conflict marker letters, no more, no
> + * less, followed by SP or any whitespace
> + * (including LF).
> + */
> +static int is_cmarker(char *buf, int marker_char, int marker_size)
> {
> + int want_sp;
> +
> + /*
> + * The beginning of our version and the end of their version
> + * always are labeled like "<<<<< ours" or ">>>>> theirs",
> + * hence we set want_sp for them.  Note that the version from
> + * the common ancestor in diff3-style output is not always
> + * labelled (e.g. "||||| common" is often seen but "|||||"
> + * alone is also valid), so we do not set want_sp.
> + */
> + want_sp = (marker_char == '<') || (marker_char == '>');
> +
>  while (marker_size--)
>  if (*buf++ != marker_char)
>  return 0;
> @@ -172,19 +189,19 @@ static int handle_path(unsigned char *sha1, 
> struct rerere_io *io, int marker_siz
>  git_SHA1_Init(&ctx);
>
>  while (!io->getline(&buf, io)) {
> - if (is_cmarker(buf.buf, '<', marker_size, 1)) {
> + if (is_cmarker(buf.buf, '<', marker_size)) {
>  if (hunk != RR_CONTEXT)
>  goto bad;
>  hunk = RR_SIDE_1;
> - } else if (is_cmarker(buf.buf, '|', marker_size, 0)) {
> + } else if (is_cmarker(buf.buf, '|', marker_size)) {
>  if (hunk != RR_SIDE_1)
>  goto bad;
>  hunk = RR_ORIGINAL;
> - } else if (is_cmarker(buf.buf, '=', marker_size, 0)) {
> + } else if (is_cmarker(buf.buf, '=', marker_size)) {
>  if (hunk != RR_SIDE_1 && hunk != RR_ORIGINAL)
>  goto bad;
>  hunk = RR_SIDE_2;
> - } else if (is_cmarker(buf.buf, '>', marker_size, 1)) {
> + } else if (is_cmarker(buf.buf, '>', marker_size)) {
>  if (hunk != RR_SIDE_2)
>  goto bad;
>  if (strbuf_cmp(&one, &two) > 0)
> -- 
> 2.5.0-rc2-340-g0cccc16
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>