[PATCH] merge-recursive: Fix copy-paste mistake
- From
Stefan Beller <stefanbeller@gmail.com>
- Date
- Sep 21, 2014, 20:49 UTC
- Message-ID
- <1411332586-18275-1-git-send-email-stefanbeller@gmail.com>
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 <stefanbeller@gmail.com> --- merge-recursive.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/merge-recursive.c b/merge-recursive.c index 22315c3..d63524c 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1555,7 +1555,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:
-- 2.1.0.238.gce1d3a9