X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=7c282532b044daaf9afd64337c5fcb0418af2499;hb=8963f3d0cf1aa5478af5875a958a5129c0aff277;hp=acb456373190fcd29e555eaf3353befbfc70c4ef;hpb=03f67737414ebb3631f097d45c5aff9a83e63b1b;p=dgit.git

diff --git a/dgit b/dgit
index acb45637..7c282532 100755
--- a/dgit
+++ b/dgit
@@ -96,6 +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 (@git) = qw(git);
 our (@dget) = qw(dget);
@@ -2367,6 +2368,8 @@ END
 	my $path = $ENV{PATH} or die;
 
 	foreach my $use_absurd (qw(0 1)) {
+	    runcmd @git, qw(checkout -q unpa);
+	    runcmd @git, qw(update-ref -d refs/heads/patch-queue/unpa);
 	    local $ENV{PATH} = $path;
 	    if ($use_absurd) {
 		chomp $@;
@@ -2511,6 +2514,7 @@ sub git_fetch_us () {
 	    \&debiantag_new, \&debiantag_maintview)
 	 : debiantags('*',access_nomdistro));
     push @specs, server_branch($csuite);
+    push @specs, $rewritemap;
     push @specs, qw(heads/*) if deliberately_not_fast_forward;
 
     # This is rather miserable:
@@ -2722,6 +2726,18 @@ sub fetch_from_archive () {
 	progress "no version available from the archive";
     }
 
+    my $rewritemapdata = git_cat_file lrfetchrefs."/".$rewritemap.':map';
+    if (defined $rewritemapdata
+	&& $rewritemapdata =~ m/^$dsc_hash(?:[ \t](\w+))/m) {
+	progress "server's git history rewrite map contains a relevant entry!";
+	$dsc_hash = $1;
+	if (defined $dsc_hash) {
+	    progress "using rewritten git hash in place of .dsc value";
+	} else {
+	    progress "server data says .dsc hash is to be disregarded";
+	}
+    }
+
     # If the archive's .dsc has a Dgit field, there are three
     # relevant git commitids we need to choose between and/or merge
     # together:
@@ -3536,7 +3552,7 @@ tree $tree
 parent $dgitview
 parent $archive_hash
 author $authline
-commiter $authline
+committer $authline
 
 $msg_msg
 
@@ -5873,9 +5889,10 @@ sub cmd_import_dsc {
     parse_dscdata();
 
     my $dgit_commit = $dsc->{$ourdscfield[0]};
-    if (defined $dgit_commit && 
-	!forceing [qw(import-dsc-with-dgit-field)]) {
+    if (defined $dgit_commit
+	&& !forceing [qw(import-dsc-with-dgit-field)]) {
 	$dgit_commit =~ m/\w+/ or fail "invalid hash in .dsc";
+	$dgit_commit = $&;
 	progress "dgit: import-dsc of .dsc with Dgit field, using git hash";
 	my @cmd = (qw(sh -ec),
 		   "echo $dgit_commit | git cat-file --batch-check");
@@ -5942,10 +5959,14 @@ END
 	    progress "Import, merging.";
 	    my $tree = cmdoutput @git, qw(rev-parse), "$newhash:";
 	    my $version = getfield $dsc, 'Version';
+	    my $clogp = commit_getclogp $newhash;
+	    my $authline = clogp_authline $clogp;
 	    $newhash = make_commit_text <<END;
 tree $tree
 parent $newhash
 parent $oldhash
+author $authline
+committer $authline
 
 Merge $package ($version) import into $dstbranch
 END