X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=b70f8d91ff1f0824dd24cdd0fc3c1c643ddabf20;hp=a8cf7917d76656a735be3c776c6fcec8b447eac1;hb=6f6ffad94a649300cea96914c4ee38f1c55f6f32;hpb=1612af17881494817cbee523895f6d3c2d210812 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}; }