1 files changed, 10 insertions, 10 deletions

diff --git a/dgit b/dgit
index 36e0a2b..f79e3cf 100755
--- a/dgit
+++ b/dgit
@@ -177,7 +177,7 @@ our $do_split_brain;
 
 # Interactions between quilt mode and split brain
 # (currently, split brain only implemented iff
-#  madformat_wantfixup && quiltmode_splitbrain)
+#  madformat_wantfixup && quiltmode_splitting)
 #
 #   source format        sane           `3.0 (quilt)'
 #                                       madformat_wantfixup()
@@ -291,7 +291,7 @@ sub deliberately_not_fast_forward () {
     }
 }
 
-sub quiltmode_splitbrain () {
+sub quiltmode_splitting () {
     $quilt_mode =~ m/gbp|dpm|unapplied/;
 }
 
@@ -970,7 +970,7 @@ sub notpushing () {
 sub determine_whether_split_brain () {
     my ($format,) = get_source_format();
     printdebug "format $format, quilt mode $quilt_mode\n";
-    if (madformat_wantfixup($format) && quiltmode_splitbrain()) {
+    if (madformat_wantfixup($format) && quiltmode_splitting()) {
 	$do_split_brain = 1;
     }
     $do_split_brain //= 0;
@@ -4444,7 +4444,7 @@ END
     my $actualhead = git_rev_parse('HEAD');
 
     if (branch_is_gdr_unstitched_ff($symref, $actualhead, $archive_hash)) {
-	if (quiltmode_splitbrain()) {
+	if (quiltmode_splitting()) {
 	    my ($ffq_prev, $gdrlast) = branch_gdr_info($symref, $actualhead);
 	    fail f_ <<END, $ffq_prev, $quilt_mode;
 Branch is managed by git-debrebase (%s
@@ -5342,7 +5342,7 @@ sub quiltify_tree_sentinelfiles ($) {
     return $r;
 }
 
-sub quiltify_splitbrain ($$$$$$$) {
+sub quiltify_splitting ($$$$$$$) {
     my ($clogp, $unapplied, $headref, $oldtiptree, $diffbits,
 	$editedignores, $cachekey) = @_;
     my $gitignore_special = 1;
@@ -5773,7 +5773,7 @@ sub build_maybe_quilt_fixup () {
 	fail f_
  "quilt mode %s does not make sense (or is not supported) with single-debian-patch",
 	    $quilt_mode
-	    if quiltmode_splitbrain();
+	    if quiltmode_splitting();
 	quilt_fixup_singlepatch($clogp, $headref, $upstreamversion);
     } else {
 	quilt_fixup_multipatch($clogp, $headref, $upstreamversion,
@@ -6211,10 +6211,10 @@ END
     push @failsuggestion, [ 'origs', __
  "Maybe orig tarball(s) are not identical to git representation?" ];
 
-    if (quiltmode_splitbrain()) {
-	quiltify_splitbrain($clogp, $unapplied, $headref, $oldtiptree,
-                            $diffbits, \%editedignores,
-			    $splitbrain_cachekey);
+    if (quiltmode_splitting()) {
+	quiltify_splitting($clogp, $unapplied, $headref, $oldtiptree,
+			   $diffbits, \%editedignores,
+			   $splitbrain_cachekey);
 	return;
     }