summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2015-05-27 21:35:15 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2015-05-31 12:58:15 +0100
commit6539061dd349972a00899120f7997efa1e7824cd (patch)
treeca615e12541cc64e4792c7c131c0b2a4e18771ad /dgit
parent9a69602bffdc82084152fd322862197c51ea7d1b (diff)
dgit: Break out deliberately_not_fast_forward (nfc)
Diffstat (limited to 'dgit')
-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".