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:
12a1359
)
git-debrebase: Provide snags_maybe_bail_early
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 8 Jul 2018 18:43:06 +0000
(19:43 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 8 Jul 2018 23:15:21 +0000
(
00:15
+0100)
No callers yet.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase
patch
|
blob
|
history
diff --git
a/git-debrebase
b/git-debrebase
index 83abc3b2002e55ef16df7d0e602c41f41bda79b7..f1ae053317e7950367de5520fd8521b84cdc56fa 100755
(executable)
--- a/
git-debrebase
+++ b/
git-debrebase
@@
-276,6
+276,11
@@
sub snags_maybe_bail () {
}
$snags_summarised = $snags_forced + $snags_tripped;
}
+sub snags_maybe_bail_early () {
+ # useful to bail out early without doing a lot of work;
+ # not a substitute for snags_maybe_bail.
+ snags_maybe_bail() if $snags_tripped && !$opt_force;
+}
sub any_snags () {
return $snags_forced || $snags_tripped;
}