[PATCH 1/4] Git.pm: config_boolean() -> config_bool()
From: Petr Baudis <hidden>
Date: 2016-06-15 22:43:07
Subsystem:
the rest · Maintainer:
Linus Torvalds
This patch renames config_boolean() to config_bool() for consistency with the commandline interface and because it is shorter but still obvious. ;-) It also changes the return value from some obscure string to real Perl boolean, allowing for clean user code. Signed-off-by: Petr Baudis <redacted> --- git-remote.perl | 4 ++-- perl/Git.pm | 12 ++++++++---- 2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/git-remote.perl b/git-remote.perl
index 52013fe..5763799 100755
--- a/git-remote.perl
+++ b/git-remote.perl@@ -297,9 +297,9 @@ sub update_remote { } elsif ($name eq 'default') { undef @remotes; for (sort keys %$remote) { - my $do_fetch = $git->config_boolean("remote." . $_ . + my $do_fetch = $git->config_bool("remote." . $_ . ".skipDefaultUpdate"); - if (!defined($do_fetch) || $do_fetch ne "true") { + unless ($do_fetch) { push @remotes, $_; } }
diff --git a/perl/Git.pm b/perl/Git.pm
index b5b1cf5..50c2993 100644
--- a/perl/Git.pm
+++ b/perl/Git.pm@@ -516,9 +516,11 @@ sub config { } -=item config_boolean ( VARIABLE ) +=item config_bool ( VARIABLE ) -Retrieve the boolean configuration C<VARIABLE>. +Retrieve the bool configuration C<VARIABLE>. The return value +is usable as a boolean in perl (and C<undef> if it's not defined, +of course). Must be called on a repository instance.
@@ -526,14 +528,16 @@ This currently wraps command('config') s =cut -sub config_boolean { +sub config_bool { my ($self, $var) = @_; $self->repo_path() or throw Error::Simple("not a repository"); try { - return $self->command_oneline('config', '--bool', '--get', + my $var = $self->command_oneline('config', '--bool', '--get', $var); + return undef unless defined $var; + return $var eq 'true'; } catch Git::Error::Command with { my $E = shift; if ($E->value() == 1) {