summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config.c10
-rwxr-xr-xt/t5534-push-signed.sh2
2 files changed, 6 insertions, 6 deletions
diff --git a/config.c b/config.c
index ce763c824c..25d798f4cf 100644
--- a/config.c
+++ b/config.c
@@ -728,11 +728,6 @@ static int git_parse_maybe_bool_text(const char *value)
int git_parse_maybe_bool(const char *value)
{
- return git_parse_maybe_bool_text(value);
-}
-
-int git_config_maybe_bool(const char *name, const char *value)
-{
int v = git_parse_maybe_bool_text(value);
if (0 <= v)
return v;
@@ -741,6 +736,11 @@ int git_config_maybe_bool(const char *name, const char *value)
return -1;
}
+int git_config_maybe_bool(const char *name, const char *value)
+{
+ return git_parse_maybe_bool(value);
+}
+
int git_config_bool_or_int(const char *name, const char *value, int *is_bool)
{
int v = git_parse_maybe_bool_text(value);
diff --git a/t/t5534-push-signed.sh b/t/t5534-push-signed.sh
index 591a26278d..f88487bea2 100755
--- a/t/t5534-push-signed.sh
+++ b/t/t5534-push-signed.sh
@@ -71,7 +71,7 @@ test_expect_success 'push --signed fails with a receiver without push certificat
test_i18ngrep "the receiving end does not support" err
'
-test_expect_failure 'push --signed=1 is accepted' '
+test_expect_success 'push --signed=1 is accepted' '
prepare_dst &&
mkdir -p dst/.git/hooks &&
test_must_fail git push --signed=1 dst noop ff +noff 2>err &&