From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 8 Jul 2018 18:42:08 +0000 (+0100)
Subject: git-debrebase: Replace `die badusage' with `badusage'.
X-Git-Tag: archive/debian/5.9~12
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=12a135919628ab710b3da22aca356726ea80bd39;hp=e61a5d637119adfbdb1b38f3a23e36cb7da6a7ac;p=dgit.git

git-debrebase: Replace `die badusage' with `badusage'.

badusage contains a call to finish.  So the die is redundant and never
gets called.

No functional change.

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

diff --git a/git-debrebase b/git-debrebase
index a79b4867..83abc3b2 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -1496,7 +1496,7 @@ sub cmd_status () {
 
 sub cmd_stitch () {
     my $prose = 'stitch';
-    GetOptions('prose=s', \$prose) or die badusage("bad options to stitch");
+    GetOptions('prose=s', \$prose) or badusage("bad options to stitch");
     badusage "no arguments allowed" if @ARGV;
     do_stitch $prose, 0;
 }
@@ -1560,7 +1560,7 @@ sub make_patches ($) {
 sub cmd_make_patches () {
     my $opt_quiet_would_amend;
     GetOptions('quiet-would-amend!', \$opt_quiet_would_amend)
-	or die badusage("bad options to make-patches");
+	or badusage("bad options to make-patches");
     badusage "no arguments allowed" if @ARGV;
     my $old_head = get_head();
     my $new = make_patches $old_head;
@@ -1741,7 +1741,7 @@ GetOptions("D+" => \$debuglevel,
 	       # approach.  '-i=s{0,}' does not work with bundling.
 	       push @$opt_defaultcmd_interactive, @ARGV;
 	       @ARGV=();
-	   }) or die badusage "bad options\n";
+	   }) or badusage "bad options\n";
 initdebug('git-debrebase ');
 enabledebug if $debuglevel;