}
open my $fh, '>', '.commitmsg'
or die ">.commitmsg: $!";
- print $fh "$cmsg" . "::stable-branch::reject=$r\n"
+ print $fh "REJECT! $cmsg" . "::stable-branch::reject=$r\n"
or die ">.commitmsg: $!";
close $fh
or die ">.commitmsg: $!";
}
open my $fh, '>', '.commitmsg'
or die ">.commitmsg: $!";
- print $fh "$cmsg" . "::stable-branch::unreject=$r\n"
+ print $fh "UNREJECT! $cmsg" . "::stable-branch::unreject=$r\n"
or die ">.commitmsg: $!";
close $fh
or die ">.commitmsg: $!";
}
if($do_commit)
{
- run 'git', 'commit', '-F', '.commitmsg'
+ run 'git', 'commit', '--allow-empty', '-F', '.commitmsg'
or (run 'git', 'mergetool'
- and run 'git', 'commit', '-F', '.commitmsg')
+ and run 'git', 'commit', '--allow-empty', '-F', '.commitmsg')
or die "git-commit: $!";
}
}
}
open my $fh, '>', '.commitmsg'
or die ">.commitmsg: $!";
- print $fh "UNMERGE\n$cmsg" . "::stable-branch::unmerge=$r\n"
+ print $fh "UNMERGE! $cmsg" . "::stable-branch::unmerge=$r\n"
or die ">.commitmsg: $!";
close $fh
or die ">.commitmsg: $!";
}
if($do_commit)
{
- run 'git', 'commit', '-F', '.commitmsg'
+ run 'git', 'commit', '--allow-empty', '-F', '.commitmsg'
or (run 'git', 'mergetool'
- and run 'git', 'commit', '-F', '.commitmsg')
+ and run 'git', 'commit', '--allow-empty', '-F', '.commitmsg')
or die "git-commit: $!";
}
}
{
unshift @rlog, ['reject', $log->{order_a}[$_]];
}
- elsif(!$log->{bitmap}[$_])
+ elsif($log->{bitmap}[$_] == 0)
{
unshift @rlog, ['unmerge', $log->{order_a}[$_]];
}
my $data = $logmsg{$_};
if($data =~ /::stable-branch::unmerge=(\S+)/)
{
+ next if not defined $history{$1};
push @logdata, ['unmerge', $1];
}
elsif($data =~ /::stable-branch::merge=(\S+)/)
{
+ next if not defined $history{$1};
push @logdata, ['merge', $1];
}
elsif($data =~ /::stable-branch::reject=(\S+)/)
{
+ next if not defined $history{$1};
push @logdata, ['reject', $1];
}
elsif($data =~ /::stable-branch::unreject=(\S+)/)
{
+ next if not defined $history{$1};
push @logdata, ['unreject', $1];
}
elsif($data =~ /::stable-branch::reset=(\S+)/)
{
+ next if not defined $history{$1};
@logdata = ();
$base = $1;
}
elsif($data =~ /::stable-branch::rebase=(\S+)/)
{
+ next if not defined $history{$1};
$lastrebase->[0] = 'ignore'
if defined $lastrebase;
push @logdata, ($lastrebase = ['rebase', $1]);