Git Mailing List Archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Johan Walles <johan.walles@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Chunk header @@@ counts wrong?
Date: Thu, 02 May 2024 13:47:30 -0700	[thread overview]
Message-ID: <xmqqfrv0c55p.fsf@gitster.g> (raw)
In-Reply-To: <xmqqmsp8c5d3.fsf@gitster.g> (Junio C. Hamano's message of "Thu, 02 May 2024 13:43:04 -0700")

Junio C Hamano <gitster@pobox.com> writes:

>> * 51 plus-space (new to v1 but already in v2) lines
>
> I think you failed to count three lines in v2 and merge result, they
> look like "<<< HEAD" "======" ">>> 8eec118"; new to v1 but already
> in v2 lines are 54, not 51, no?

Ah, I take that back.  These have ++ that are new relative to parent
#1 and parent #2 (i.e. only the tentative merge result has them).
So, yes, I think you are counting correctly.

Sorry, but I do not know what's counting the hunk length numbers in
today's code offhand, so I won't be digging it further for now.

      reply	other threads:[~2024-05-02 20:47 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-02 16:51 Chunk header @@@ counts wrong? Johan Walles
2024-05-02 20:43 ` Junio C Hamano
2024-05-02 20:47   ` Junio C Hamano [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqfrv0c55p.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=johan.walles@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).