diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-02-10 17:55:22 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 12:25:49 +0100 |
commit | e61834ee5d6dc6e38d946b75112dbed6982a8560 (patch) | |
tree | 70aaeca0f3c25c71a4f4210ae1d465cb74ffc0ed /git-debrebase | |
parent | 17dce7274cfdba60a0c5c4c37045a4a37c070146 (diff) |
git-debrebase: introduce any_fproblems (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase')
-rwxr-xr-x | git-debrebase | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/git-debrebase b/git-debrebase index 4a1ea57..11a1896 100755 --- a/git-debrebase +++ b/git-debrebase @@ -271,6 +271,9 @@ sub fproblems_maybe_bail () { } } } +sub any_fproblems () { + return !!$fproblems; +} # classify returns an info hash like this # CommitId => $objid @@ -926,7 +929,7 @@ sub cmd_new_upstream_v0 () { in_workarea sub { my @upstream_merge_parents; - if (!$fproblems) { + if (!any_fproblems()) { push @upstream_merge_parents, $old_upstream->{CommitId}; } |