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 <stefanbeller@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Stefan Beller committed
Sep 21, 2014 at 22:49 UTC
422af49c2fe707c5e7bff1e4a8250232401154b0
1 file changed
+1
-1
merge-recursive.c
+1
-1
@@ -1094,7 +1094,7 @@ static int blob_unchanged(const unsigned char *o_sha,
1094
* unchanged since their sha1s have already been compared.
1095
*/
1096
if (renormalize_buffer(path, o.buf, o.len, &o) |
1097
- renormalize_buffer(path, a.buf, o.len, &a))
1097
+ renormalize_buffer(path, a.buf, a.len, &a))
1098
ret = (o.len == a.len && !memcmp(o.buf, a.buf, o.len));
1099
1100
error_return: