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-badcommit-fixup: New mode --check which is readonly.
[dgit.git]
/
dgit-badcommit-fixup
diff --git
a/dgit-badcommit-fixup
b/dgit-badcommit-fixup
index c119c4acae99f65f8e7e626b0a7960fb54bcb1fd..a9a8f60f88aa94d7e459e968a091f826abcd955d 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
@@
-34,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 ?";
}
@@
-254,40
+257,45
@@
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 $!;
}