rm -rf $tmp
mkdir $tmp
-LC_MESSAGES=C git fsck --no-dangling 2>&1 | \
- perl -ne 'print $1 if m/^error in commit d1a977e7f9637372750ac02a58e85c35ddd4ca54:.*invalid format - expected '\''committer' | \
- >$tmp/bad
+LC_MESSAGES=C git fsck --no-dangling >$tmp/gfo 2>&1 || test $? = 1
+
+perl -ne '
+ print $1, "\n" or die $! if
+ m/^error in commit (\w+):.*invalid format - expected '\''committer/;
+' <$tmp/gfo >$tmp/bad
case `wc -l <$tmp/bad` in
0)
exit 8 ;;
1)
read <$tmp/bad bads
- nots="^$onlybad^0 ^$onlybad^1"
+ nots="^$bads^0 ^$bads^1"
;;
*)
bads="cat $tmp/bad"
args="$nots"
-for head in `git-show-ref --heads`; do
+for head in HEAD `git-for-each-ref --format='%(refname)'`; do
exec <$tmp/bad
needed=false
for bad in $bads; do
args+=" $head"
done
-echo $args
+cat >$tmp/flt <<'END'
+#!/usr/bin/perl -w
+use strict;
+undef $/;
+$_ = <STDIN>;
+s/^(\w+.*\n)*commiter /$1committer /;
+END
+
+git filter-branch --original dgit-badcommit --commit-filter '
+ sed -e '\''1,/^$/ s/^commiter /committer /'\''
+' $args