diff options
author | Petr Baudis <pasky@suse.cz> | 2007-05-09 12:49:41 +0200 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2007-05-10 14:13:29 -0700 |
commit | 35c49eeae7e71e8554f27958a16405397c69b552 (patch) | |
tree | 3cf797fe55167e326c8b9f74b99317918b5da2b3 | |
parent | efa615ba089e88c0d2645f444373751de0529214 (diff) | |
download | git-35c49eeae7e71e8554f27958a16405397c69b552.tar.gz |
Git.pm: config_boolean() -> config_bool()
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 <pasky@suse.cz>
-rwxr-xr-x | git-remote.perl | 4 | ||||
-rwxr-xr-x | git-send-email.perl | 4 | ||||
-rw-r--r-- | perl/Git.pm | 12 |
3 files changed, 12 insertions, 8 deletions
diff --git a/git-remote.perl b/git-remote.perl index 52013fe76d..5763799127 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/git-send-email.perl b/git-send-email.perl index a6e3e02619..404095f258 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -154,8 +154,8 @@ if ($@) { $term = new FakeTerm "$@: going non-interactive"; } -my $def_chain = $repo->config_boolean('sendemail.chainreplyto'); -if ($def_chain and $def_chain eq 'false') { +my $def_chain = $repo->config_bool('sendemail.chainreplyto'); +if (defined $def_chain and not $def_chain) { $chain_reply_to = 0; } diff --git a/perl/Git.pm b/perl/Git.pm index b5b1cf5edc..8fd3611753 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') so it is not so fast. =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 $val = $self->command_oneline('config', '--bool', '--get', $var); + return undef unless defined $val; + return $val eq 'true'; } catch Git::Error::Command with { my $E = shift; if ($E->value() == 1) { |