Merge branch 'libgit-2.29'
[TortoiseGit.git] / ext / libgit2-0001-Fix-error-return-for-invalid-extensions.patch
blobbe926c746fffd2d4ba6b4dc91a53e7f6977b22ad
1 From 5b7e71314b6e232d117aa7c07b1f91f9ae063a6a Mon Sep 17 00:00:00 2001
2 From: Eric Huss <eric@huss.org>
3 Date: Wed, 7 Oct 2020 15:54:08 -0700
4 Subject: [PATCH] Fix error return for invalid extensions.
6 ---
7 src/repository.c | 4 ++--
8 1 file changed, 2 insertions(+), 2 deletions(-)
10 diff --git a/src/repository.c b/src/repository.c
11 index a1186832b..513dbd61f 100644
12 --- a/src/repository.c
13 +++ b/src/repository.c
14 @@ -860,7 +860,7 @@ int git_repository_open_ext(
15 if (config && (error = check_repositoryformatversion(&version, config)) < 0)
16 goto cleanup;
18 - if ((error = check_extensions(config, version) < 0))
19 + if ((error = check_extensions(config, version)) < 0)
20 goto cleanup;
22 if ((flags & GIT_REPOSITORY_OPEN_BARE) != 0)
23 @@ -1613,7 +1613,7 @@ static int repo_init_config(
24 if (is_reinit && (error = check_repositoryformatversion(&version, config)) < 0)
25 goto cleanup;
27 - if ((error = check_extensions(config, version) < 0))
28 + if ((error = check_extensions(config, version)) < 0)
29 goto cleanup;
31 #define SET_REPO_CONFIG(TYPE, NAME, VAL) do { \
32 --
33 2.28.0.windows.1