From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 9 Feb 2018 21:54:45 +0000 (+0000)
Subject: git-debrebase: fix break out fproblem
X-Git-Tag: archive/debian/5.0~268
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=6f6ffad94a649300cea96914c4ee38f1c55f6f32;ds=sidebyside

git-debrebase: fix break out fproblem

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

diff --git a/git-debrebase b/git-debrebase
index a8cf7917..b70f8d91 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -912,7 +912,7 @@ sub cmd_new_upstream_v0 () {
     in_workarea sub {
 	my @upstream_merge_parents;
 
-	if (!$problems) {
+	if (!$fproblems) {
 	    push @upstream_merge_parents, $old_upstream->{CommitId};
 	}