chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change name of rewrite map ref (needs an extra / for git)
[dgit.git]
/
dgit-badcommit-fixup
diff --git
a/dgit-badcommit-fixup
b/dgit-badcommit-fixup
index cd62e6820f9155f29d299aa4b3a2b5cd266857c1..2708e1ccabe98c5ded0867e8c315700dd7b46b83 100755
(executable)
--- a/
dgit-badcommit-fixup
+++ b/
dgit-badcommit-fixup
@@
-196,7
+196,7
@@
foreach my $rline (split /\n/, $refs) {
my ($obj, $type, $refname) =
$rline =~ m/^(\w+)\s+(\w+)\s+(\S.*)/
or die "$_ ?";
my ($obj, $type, $refname) =
$rline =~ m/^(\w+)\s+(\w+)\s+(\S.*)/
or die "$_ ?";
- if ($refname eq 'refs/dgit-rewrite
-
map') {
+ if ($refname eq 'refs/dgit-rewrite
/
map') {
$org_rewrite_map = $obj;
continue;
}
$org_rewrite_map = $obj;
continue;
}
@@
-214,7
+214,7
@@
foreach my $rline (split /\n/, $refs) {
if ($bare eq 'true') {
my $new_rewrite_map = edit_rewrite_map($org_rewrite_map);
if ($bare eq 'true') {
my $new_rewrite_map = edit_rewrite_map($org_rewrite_map);
- push @updates, [ 'refs/dgit-rewrite
-
map',
+ push @updates, [ 'refs/dgit-rewrite
/
map',
($org_rewrite_map // '0'x40),
$new_rewrite_map ];
}
($org_rewrite_map // '0'x40),
$new_rewrite_map ];
}