diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-02-15 15:57:38 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 12:25:49 +0100 |
commit | d5903f6b2f7c822465ec26f7903c3c823410c7e0 (patch) | |
tree | c29b6615500a1dc422aa262ce0d088526b8e0bca | |
parent | 0657f0fde8f3f07e319744262c1642ffc6b82208 (diff) |
git-debrebase: bugfixes to record_ffq_prev
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-x | git-debrebase | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/git-debrebase b/git-debrebase index 726c7be..979d8e0 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 $!; |