From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 16 Jun 2018 19:40:31 +0000 (+0100)
Subject: git-debrebase: keycommits abolish use of last etc.
X-Git-Tag: archive/debian/5.0~38
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=d0f938a6ab692ed24009b2f1c101e6e91a242b7d

git-debrebase: keycommits abolish use of last etc.

Previously, presumably, this little fragment was within an anonymous
sub.  Now it isn't any more, and we can simply return.

No functional change.

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

diff --git a/git-debrebase b/git-debrebase
index c0600126..9a356df3 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -604,10 +604,7 @@ sub keycommits ($;$$$) {
 	} elsif ($ty eq 'DgitImportUnpatched') {
 	    $x->($trouble, 'dgitimport',
 		 "found dgit dsc import ($head)");
-	    $breakwater = undef;
-	    $anchor = undef;
-	    no warnings qw(exiting);
-	    last;
+	    return (undef,undef);
 	} else {
 	    fail "found unprocessable commit, cannot cope: $head; $cl->{Why}";
 	}