chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dgit-maint-merge(7): Quote sample clone commands
[dgit.git]
/
dgit-badcommit-fixup
diff --git
a/dgit-badcommit-fixup
b/dgit-badcommit-fixup
index d1bca74dc23f245e2d4b88dec1455df1400bbb55..8b202c0ae9617883d31239f6758843122cd2ff5c 100755
(executable)
--- a/
dgit-badcommit-fixup
+++ b/
dgit-badcommit-fixup
@@
-3,6
+3,7
@@
# Script to help with fallout from #849041.
#
# usage:
# Script to help with fallout from #849041.
#
# usage:
+# dgit-badcommit-fixup --check
# dgit-badcommit-fixup --test
# dgit-badcommit-fixup --real
# dgit-badcommit-fixup --test
# dgit-badcommit-fixup --real
@@
-25,6
+26,8
@@
use POSIX;
use IPC::Open2;
use Data::Dumper;
use IPC::Open2;
use Data::Dumper;
+our $our_version = 'UNRELEASED'; ###substituted###
+
my $real;
foreach my $a (@ARGV) {
my $real;
foreach my $a (@ARGV) {
@@
-32,6
+35,8
@@
foreach my $a (@ARGV) {
$real = 0;
} elsif ($a eq '--real') {
$real = 1;
$real = 0;
} elsif ($a eq '--real') {
$real = 1;
+ } elsif ($a eq '--check') {
+ $real = -1;
} else {
die "$a ?";
}
} else {
die "$a ?";
}
@@
-193,9
+198,11
@@
sub edit_rewrite_map ($) {
runcmd qw(git add map);
}
runcmd qw(git add map);
}
- runcmd qw(git commit -q),
- qw(-m), 'dgit-badcommit-fixup',
- qw(map);
+ runcmd qw(git commit -q), qw(-m), <<END, qw(map);
+dgit-badcommit-fixup
+
+[dgit-badcommit-fixup $our_version]
+END
$!=0; $?=0;
my $new = `git rev-parse HEAD`;
$!=0; $?=0;
my $new = `git rev-parse HEAD`;
@@
-224,8
+231,20
@@
foreach my $rline (split /\n/, $refs) {
or die "$_ ?";
if ($refname eq 'refs/dgit-rewrite/map') {
$org_rewrite_map = $obj;
or die "$_ ?";
if ($refname eq 'refs/dgit-rewrite/map') {
$org_rewrite_map = $obj;
- continue;
+ next;
+ }
+ next if $refname =~ m{^refs/dgit-(?:badcommit|badfixuptest)/};
+
+ $!=0; $?=0;
+ system qw(sh -ec),
+ 'exec >/dev/null git symbolic-ref -q "$1"', qw(x),
+ $refname;
+ if ($?==0) {
+ $count{symrefs_ignored}++;
+ next;
}
}
+ die "$? $!" unless $?==256;
+
my $rewrite;
if ($type eq 'commit') {
$rewrite = rewrite_commit($obj);
my $rewrite;
if ($type eq 'commit') {
$rewrite = rewrite_commit($obj);
@@
-249,40
+268,48
@@
if ($bare eq 'true') {
filter_updates();
if (!@updates) {
filter_updates();
if (!@updates) {
- print Dumper(\%count), "nothing to do\n";
+ print Dumper(\%count), "
all is well -
nothing to do\n";
exit 0;
}
#print Dumper(\@updates);
exit 0;
}
#print Dumper(\@updates);
-open U, "|git update-ref -m 'dgit bad commit fixup' --stdin" or die $!;
+open U, "|git update-ref -m 'dgit bad commit fixup' --stdin" or die $!
+ if $real >= 0;
for my $up (@updates) {
my ($ref, $old, $new, $nobackup) = @$up;
my $otherref = $ref;
$otherref =~ s{^refs/}{};
for my $up (@updates) {
my ($ref, $old, $new, $nobackup) = @$up;
my $otherref = $ref;
$otherref =~ s{^refs/}{};
- if ($real) {
+ if ($real
> 0
) {
print U <<END or die $! unless $nobackup;
create refs/dgit-badcommit/$otherref $old
END
print U <<END or die $!;
update $ref $new $old
END
print U <<END or die $! unless $nobackup;
create refs/dgit-badcommit/$otherref $old
END
print U <<END or die $!;
update $ref $new $old
END
- } els
e
{
+ } els
if ($real==0)
{
print U <<END or die $!;
update refs/dgit-badfixuptest/$otherref $new
END
print U <<END or die $!;
update refs/dgit-badfixuptest/$otherref $new
END
+ } else {
+ print "found trouble in history of $ref\n" or die $!;
}
}
}
}
-$?=0; $!=0;
-close U or die "$? $!";
-die $? if $?;
+if ($real >= 0) {
+ $?=0; $!=0;
+ close U or die "$? $!";
+ die $? if $?;
+}
print Dumper(\%count);
print Dumper(\%count);
-if ($real) {
+if ($real
>= 0
) {
print "old values saved in refs/dgit-badcommit/\n" or die $!;
print "old values saved in refs/dgit-badcommit/\n" or die $!;
-} els
e
{
+} els
if ($real == 0)
{
print "testing output saved in refs/dgit-badfixuptest/\n" or die $!;
print "testing output saved in refs/dgit-badfixuptest/\n" or die $!;
+} else {
+ print STDERR "found work to do, exiting status 2\n";
+ exit 2;
}
}