From: Stefan Beller Date: Sun, 21 Sep 2014 20:49:46 +0000 (+0200) Subject: merge-recursive: fix copy-paste mistake X-Git-Tag: v2.2.0-rc0~69^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=422af49c2fe707c5e7bff1e4a8250232401154b0;p=thirdparty%2Fgit.git merge-recursive: fix copy-paste mistake The following issue was found by scan.coverity.com (ID: 1049510), and claimed to be likely a copy-paste mistake. Introduced in 331a1838b (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 t6031-merge-recursive.sh, but I did not manage to come up with a test in a reasonable amount of time. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- diff --git a/merge-recursive.c b/merge-recursive.c index 5ad8fc9e7e..ceb50353f7 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -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)); error_return: