From d93bea01f0863c3fa84a3dea79cb9076dcfd4ff5 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 6 Jan 2017 17:48:38 +0000 Subject: Change name of rewrite map ref (needs an extra / for git) Signed-off-by: Ian Jackson --- dgit | 2 +- dgit-badcommit-fixup | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dgit b/dgit index 31f0da9..555e1c0 100755 --- a/dgit +++ b/dgit @@ -96,7 +96,7 @@ our $orig_f_tail_re = "$orig_f_comp_re\\.tar(?:\\.\\w+)?(?:$orig_f_sig_re)?"; our $git_authline_re = '^([^<>]+) \<(\S+)\> (\d+ [-+]\d+)$'; our $splitbraincache = 'dgit-intern/quilt-cache'; -our $rewritemap = 'dgit-rewrite-map'; +our $rewritemap = 'dgit-rewrite/map'; our (@git) = qw(git); our (@dget) = qw(dget); diff --git a/dgit-badcommit-fixup b/dgit-badcommit-fixup index cd62e68..2708e1c 100755 --- 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 "$_ ?"; - if ($refname eq 'refs/dgit-rewrite-map') { + if ($refname eq 'refs/dgit-rewrite/map') { $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); - push @updates, [ 'refs/dgit-rewrite-map', + push @updates, [ 'refs/dgit-rewrite/map', ($org_rewrite_map // '0'x40), $new_rewrite_map ]; } -- cgit v1.2.3