Commit 422af49c authored by Stefan Beller's avatar Stefan Beller Committed by Junio C Hamano

merge-recursive: fix copy-paste mistake

The following issue was found by (ID: 1049510),
and claimed to be likely a copy-paste mistake.

Introduced in 331a1838 (2010-07-02, Try normalizing files
to avoid delete/modify conflicts when merging), which is
quite a long time ago, so I'm rather unsure if it's of any impact
or just went unnoticed.

The line after the changed line has a comparison of 'o.len' to 'a.len',
so we should assume the lengths may be different.

I'd be happy to have a test for this bug(?) attached to, but I did not manage to
come up with a test in a reasonable amount of time.
Signed-off-by: default avatarStefan Beller <>
Signed-off-by: default avatarJunio C Hamano <>
parent 331a1838
......@@ -1094,7 +1094,7 @@ static int blob_unchanged(const unsigned char *o_sha,
* unchanged since their sha1s have already been compared.
if (renormalize_buffer(path, o.buf, o.len, &o) |
renormalize_buffer(path, a.buf, o.len, &a))
renormalize_buffer(path, a.buf, a.len, &a))
ret = (o.len == a.len && !memcmp(o.buf, a.buf, o.len));
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment