From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 3 Aug 2018 11:53:10 +0000 (+0100)
Subject: git-debrebase: factor out getoptions for subcommand
X-Git-Tag: archive/debian/6.5~24
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=fe63aca9ed9d55d546a8cb5cd83053bbaaafe309

git-debrebase: factor out getoptions for subcommand

No functional change.

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

diff --git a/git-debrebase b/git-debrebase
index b61970ce..907ebfeb 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -61,11 +61,15 @@ sub badusage ($) {
     finish 8;
 }
 
-sub getoptions {
+sub getoptions_main {
     my $m = shift;
     local $SIG{__WARN__}; # GetOptions calls `warn' to print messages
     GetOptions @_ or badusage $m;
 }
+sub getoptions {
+    my $sc = shift;
+    getoptions_main "bad options follow \`git-debrebase $sc'", @_;
+}
 
 sub cfg ($;$) {
     my ($k, $optional) = @_;
@@ -1536,7 +1540,7 @@ sub cmd_status () {
 
 sub cmd_stitch () {
     my $prose = 'stitch';
-    getoptions("bad options follow \`git-debrebase stitch'",
+    getoptions("stitch",
 	       'prose=s', \$prose);
     badusage "no arguments allowed" if @ARGV;
     do_stitch $prose, 0;
@@ -1600,7 +1604,7 @@ sub make_patches ($) {
 
 sub cmd_make_patches () {
     my $opt_quiet_would_amend;
-    getoptions("bad options follow \`git-debrebase make-patches'",
+    getoptions("make-patches",
 	       'quiet-would-amend!', \$opt_quiet_would_amend);
     badusage "no arguments allowed" if @ARGV;
     my $old_head = get_head();
@@ -1821,7 +1825,8 @@ sub cmd_downstream_rebase_launder_v0 () {
     }
 }
 
-getoptions("bad options\n",
+getoptions_main
+          ("bad options\n",
 	   "D+" => \$debuglevel,
 	   'noop-ok', => \$opt_noop_ok,
 	   'f=s' => \@snag_force_opts,