From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 15 Feb 2018 15:57:38 +0000 (+0000)
Subject: git-debrebase: bugfixes to record_ffq_prev
X-Git-Tag: archive/debian/5.0~235
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=sidebyside;h=d5903f6b2f7c822465ec26f7903c3c823410c7e0;p=dgit.git

git-debrebase: bugfixes to record_ffq_prev

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/git-debrebase b/git-debrebase
index 726c7be8..979d8e06 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -868,13 +868,13 @@ sub record_ffq_prev () {
     my $currentval = get_head();
 
     my $exists = git_get_ref $ffq_prev;
-    return ('exists',"$ffq_prev already exists") if defined $exists;
+    return ('exists',"$ffq_prev already exists") if $exists;
 
     return ('not-branch', 'HEAD symref is not to refs/heads/')
 	unless $current =~ m{^refs/heads/};
     my $branch = $';
 
-    my @check_specs = split /\;/, (cfg "branch.$branch.ffq-ffrefs") // '*';
+    my @check_specs = split /\;/, (cfg "branch.$branch.ffq-ffrefs",1) // '*';
     my %checked;
 
     my $check = sub {
@@ -901,7 +901,7 @@ sub record_ffq_prev () {
 	}
     };
 
-    my $merge = cfg "branch.$branch.merge";
+    my $merge = cfg "branch.$branch.merge",1;
     if (defined $merge && $merge =~ m{^refs/heads/}) {
 	my $rhs = $';
 	my $check_remote = sub {
@@ -909,17 +909,17 @@ sub record_ffq_prev () {
 	    return unless defined $remote;
 	    $check->("refs/remotes/$remote/$rhs", $desc);
 	};
-	$check_remote->((cfg "branch.$branch.remote"),
+	$check_remote->((cfg "branch.$branch.remote",1),
 			'remote fetch/merge branch');
-	$check_remote->((cfg "branch.$branch.pushRemote") //
-			(cfg "branch.$branch.pushDefault"),
+	$check_remote->((cfg "branch.$branch.pushRemote",1) //
+			(cfg "branch.$branch.pushDefault",1),
 			'remote push branch');
     }
     if ($branch =~ m{^dgit/}) {
 	$check->("remotes/dgit/$branch", 'remote dgit branch');
     }
 
-    fproblems_maybe_fail();
+    fproblems_maybe_bail();
     runcmd @git, qw(update-ref -m), "record current head for preservation",
 	$ffq_prev, $currentval, $git_null_obj;
     print "Recorded current head for preservation\n" or die $!;