From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 6 Jan 2017 17:48:38 +0000 (+0000)
Subject: Change name of rewrite map ref (needs an extra / for git)
X-Git-Tag: archive/debian/2.16~13
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=d93bea01f0863c3fa84a3dea79cb9076dcfd4ff5

Change name of rewrite map ref (needs an extra / for git)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/dgit b/dgit
index 31f0da93..555e1c00 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 cd62e682..2708e1cc 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 ];
 }