diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-02-09 21:54:45 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 12:25:49 +0100 |
commit | 6f6ffad94a649300cea96914c4ee38f1c55f6f32 (patch) | |
tree | a16a8649998aa719d7a770c18008720ebe276a71 | |
parent | 1612af17881494817cbee523895f6d3c2d210812 (diff) |
git-debrebase: fix break out fproblem
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-x | git-debrebase | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-debrebase b/git-debrebase index a8cf791..b70f8d9 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}; } |