From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 10 Feb 2018 17:55:22 +0000 (+0000)
Subject: git-debrebase: introduce any_fproblems (nfc)
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=2677dc849d98b7af4865b7e4beaf44727792781a;p=dgit.git

git-debrebase: introduce any_fproblems (nfc)

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

diff --git a/git-debrebase b/git-debrebase
index 4a1ea570..11a18962 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -271,6 +271,9 @@ sub fproblems_maybe_bail () {
 	}
     }
 }
+sub any_fproblems () {
+    return !!$fproblems;
+}
 
 # classify returns an info hash like this
 #   CommitId => $objid
@@ -926,7 +929,7 @@ sub cmd_new_upstream_v0 () {
     in_workarea sub {
 	my @upstream_merge_parents;
 
-	if (!$fproblems) {
+	if (!any_fproblems()) {
 	    push @upstream_merge_parents, $old_upstream->{CommitId};
 	}