summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2018-02-15 15:48:14 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2018-06-16 12:25:49 +0100
commit0657f0fde8f3f07e319744262c1642ffc6b82208 (patch)
tree4ab97dfe9a83ade01a65948b503427be803edd9f
parentdef5c8321ebffda40d2547be92a91ba1cad0aa45 (diff)
git-debrebase: make cfg optionally take $optional (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-xgit-debrebase10
1 files changed, 7 insertions, 3 deletions
diff --git a/git-debrebase b/git-debrebase
index 6f89fc2..726c7be 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -98,13 +98,17 @@ sub badusage ($) {
die "bad usage: $m\n";
}
-sub cfg ($) {
- my ($k) = @_;
+sub cfg ($;$) {
+ my ($k, $optional) = @_;
$/ = "\0";
my @cmd = qw(git config -z);
push @cmd, qw(--get-all) if wantarray;
push @cmd, $k;
- my $out = cmdoutput @cmd;
+ my $out = cmdoutput_errok @cmd;
+ if (!defined $out) {
+ fail "missing required git config $k" unless $optional;
+ return ();
+ }
return split /\0/, $out;
}