From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 15 Feb 2018 15:48:14 +0000 (+0000)
Subject: git-debrebase: make cfg optionally take $optional (nfc)
X-Git-Tag: archive/debian/5.0~236
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=0657f0fde8f3f07e319744262c1642ffc6b82208;ds=sidebyside

git-debrebase: make cfg optionally take $optional (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/git-debrebase b/git-debrebase
index 6f89fc26..726c7be8 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;
 }