chiark / gitweb /
git-debrebase: introduce any_fproblems (nfc)
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 10 Feb 2018 17:55:22 +0000 (17:55 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 11:25:49 +0000 (12:25 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase

index 4a1ea57..11a1896 100755 (executable)
@@ -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};
        }