From 6f6ffad94a649300cea96914c4ee38f1c55f6f32 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 9 Feb 2018 21:54:45 +0000 Subject: [PATCH 1/1] git-debrebase: fix break out fproblem Signed-off-by: Ian Jackson --- git-debrebase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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}; } -- 2.30.2