summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xdgit8
1 files changed, 6 insertions, 2 deletions
diff --git a/dgit b/dgit
index 759df20..6e9c304 100755
--- a/dgit
+++ b/dgit
@@ -162,6 +162,11 @@ sub deliberately ($) {
return !!grep { $_ eq "--deliberately-$enquiry" } @deliberatelies;
}
+sub deliberately_not_fast_forward () {
+ deliberately('not-fast-forward') ||
+ deliberately('TEST-not-fast-forward-dgit-only');
+}
+
#---------- remote protocol support, common ----------
# remote push initiator/responder protocol:
@@ -1816,8 +1821,7 @@ sub cmd_push {
if (fetch_from_archive()) {
if (is_fast_fwd(lrref(), 'HEAD')) {
# ok
- } elsif (deliberately('not-fast-forward') ||
- deliberately('TEST-not-fast-forward-dgit-only')) {
+ } elsif (deliberately_not_fast_forward) {
$forceflag = '+';
} else {
fail "dgit push: HEAD is not a descendant".