chiark / gitweb /
git-debrebase: fix break out fproblem
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 9 Feb 2018 21:54:45 +0000 (21:54 +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 a8cf791..b70f8d9 100755 (executable)
@@ -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};
        }