diff options
| author | Stefan Beller <stefanbeller@gmail.com> | 2014-09-21 20:49:46 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-23 18:29:20 (GMT) |
| commit | 422af49c2fe707c5e7bff1e4a8250232401154b0 (patch) | |
| tree | 9324c7bb97de39a639193145d21ec2a6b51b1c9c | |
| parent | 331a1838b26c3032bec27b66307a9de9b3b11509 (diff) | |
| download | git-422af49c2fe707c5e7bff1e4a8250232401154b0.zip git-422af49c2fe707c5e7bff1e4a8250232401154b0.tar.gz git-422af49c2fe707c5e7bff1e4a8250232401154b0.tar.bz2 | |
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>
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 5ad8fc9..ceb5035 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: |