chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0aca1d1
)
git-debrebase: introduce any_fproblems (nfc)
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 10 Feb 2018 17:55:22 +0000
(17:55 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 18 Feb 2018 12:04:43 +0000
(12:04 +0000)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase
patch
|
blob
|
history
diff --git
a/git-debrebase
b/git-debrebase
index 4a1ea570d9ed299692153b132033abab379539fd..11a1896217e10ef51a1288d99c647904f3a5817d 100755
(executable)
--- 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};
}