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: conflg handling: Undocumented --config-lookup-explode= feature.
[dgit.git]
/
dgit-badcommit-fixup
diff --git
a/dgit-badcommit-fixup
b/dgit-badcommit-fixup
index 0a1ebcf61ef208a3b26f36a145ab24cfd53120a7..8b202c0ae9617883d31239f6758843122cd2ff5c 100755
(executable)
--- a/
dgit-badcommit-fixup
+++ b/
dgit-badcommit-fixup
@@
-234,6
+234,17
@@
foreach my $rline (split /\n/, $refs) {
next;
}
next if $refname =~ m{^refs/dgit-(?:badcommit|badfixuptest)/};
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);