X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=653f4ce268c0e9946cf62111a88abaa2227e0117;hb=9d1e2dcc3134cdf8afdadc6538d2e796ee8008fa;hp=249122c7f80e109b4e2aee5bc7daf3135a82469a;hpb=9ec0d1901c3ca58fa688d065520d9862d969793c;p=dgit.git

diff --git a/dgit b/dgit
index 249122c7..653f4ce2 100755
--- a/dgit
+++ b/dgit
@@ -98,6 +98,7 @@ our (@dpkgsource) = qw(dpkg-source -i\.git/ -I.git);
 our (@dpkggenchanges) = qw(dpkg-genchanges);
 our (@mergechanges) = qw(mergechanges -f);
 our (@gbp) = qw(gbp);
+our (@gbp_build) = ('');
 our (@changesopts) = ('');
 
 our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
@@ -113,6 +114,7 @@ our %opts_opt_map = ('dget' => \@dget, # accept for compatibility
                      'dpkg-buildpackage' => \@dpkgbuildpackage,
                      'dpkg-genchanges' => \@dpkggenchanges,
                      'gbp' => \@gbp,
+                     'gbp-build' => \@gbp_build,
                      'ch' => \@changesopts,
                      'mergechanges' => \@mergechanges);
 
@@ -246,6 +248,17 @@ sub quiltmode_splitbrain () {
     $quilt_mode =~ m/gbp|dpm|unapplied/;
 }
 
+sub opts_opt_multi_cmd {
+    my @cmd;
+    push @cmd, split /\s+/, shift @_;
+    push @cmd, @_;
+    @cmd;
+}
+
+sub gbp_pq {
+    return (@gbp, qw(pq));
+}
+
 #---------- remote protocol support, common ----------
 
 # remote push initiator/responder protocol:
@@ -1833,7 +1846,25 @@ END
 	runcmd @git, qw(checkout -q -b dapplied), $dappliedcommit;
 
 	runcmd @git, qw(checkout -q -b unpa), $rawimport_hash;
-	runcmd shell_cmd 'exec >/dev/null', @gbp, qw(pq import);
+
+	# We need the answers to be reproducible
+	my @authline = clogp_authline($clogp);
+	local $ENV{GIT_COMMITTER_NAME} =  $authline[0];
+	local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
+	local $ENV{GIT_COMMITTER_DATE} =  $authline[2];
+	local $ENV{GIT_AUTHOR_NAME} =  $authline[0];
+	local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
+	local $ENV{GIT_AUTHOR_DATE} =  $authline[2];
+
+	eval {
+	    runcmd shell_cmd 'exec >/dev/null 2>../../gbp-pq-output',
+		gbp_pq, qw(import);
+	};
+	if ($@) {
+	    { local $@; eval { runcmd qw(cat ../../gbp-pq-output); }; }
+	    die $@;
+	}
+
 	my $gapplied = git_rev_parse('HEAD');
 	my $gappliedtree = cmdoutput @git, qw(rev-parse HEAD:);
 	$gappliedtree eq $dappliedtree or
@@ -2405,7 +2436,7 @@ END
     } else {
 	$hash = $mergeinputs[0]{Commit};
     }
-    progress "fetch hash=$hash\n";
+    printdebug "fetch hash=$hash\n";
 
     my $chkff = sub {
 	my ($lasth, $what) = @_;
@@ -3679,7 +3710,10 @@ sub quiltify_splitbrain ($$$$$$) {
     local $ENV{GIT_COMMITTER_NAME} =  $authline[0];
     local $ENV{GIT_COMMITTER_EMAIL} = $authline[1];
     local $ENV{GIT_COMMITTER_DATE} =  $authline[2];
-	
+    local $ENV{GIT_AUTHOR_NAME} =  $authline[0];
+    local $ENV{GIT_AUTHOR_EMAIL} = $authline[1];
+    local $ENV{GIT_AUTHOR_DATE} =  $authline[2];
+
     if ($quilt_mode =~ m/gbp|unapplied/ &&
 	($diffbits->{H2O} & 01)) {
 	my $msg =
@@ -3702,7 +3736,7 @@ END
 	($diffbits->{O2A} & 01)) { # some patches
 	quiltify_splitbrain_needed();
 	progress "dgit view: creating patches-applied version using gbp pq";
-	runcmd shell_cmd 'exec >/dev/null', @gbp, qw(pq import);
+	runcmd shell_cmd 'exec >/dev/null', gbp_pq, qw(import);
 	# gbp pq import creates a fresh branch; push back to dgit-view
 	runcmd @git, qw(update-ref refs/heads/dgit-view HEAD);
 	runcmd @git, qw(checkout -q dgit-view);
@@ -3732,7 +3766,7 @@ The Debian packaging git branch contains these updates to the upstream
 .gitignore file(s).  This patch is autogenerated, to provide these
 updates to users of the official Debian archive view of the package.
 
-[dgit version $our_version]
+[dgit ($our_version) update-gitignore]
 ---
 END
         close GIPATCH or die "$gipatch: $!";
@@ -4581,12 +4615,15 @@ sub cmd_gbp_build {
 
     my $wantsrc = massage_dbp_args \@dbp, \@ARGV;
 
-    my @cmd;
-    if (length executable_on_path('git-buildpackage')) {
-	@cmd = qw(git-buildpackage);
-    } else {
-	@cmd = qw(gbp buildpackage);
+    if (!length $gbp_build[0]) {
+	if (length executable_on_path('git-buildpackage')) {
+	    $gbp_build[0] = qw(git-buildpackage);
+	} else {
+	    $gbp_build[0] = 'gbp buildpackage';
+	}
     }
+    my @cmd = opts_opt_multi_cmd @gbp_build;
+
     push @cmd, (qw(-us -uc --git-no-sign-tags), "--git-builder=@dbp");
 
     if ($wantsrc > 0) {