X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=6b1201e7aee73dbc46cdcaa89b3c0b72987f49ce;hb=bc0c5d92e3f9fff9de05afbb7519bb29c25ac74f;hp=af14e3f9183c3984374b79e874242b293e48b5ff;hpb=4f89b4d20f0663710396f37b3b53fd32cc71b090;p=dgit.git

diff --git a/dgit b/dgit
index af14e3f9..6b1201e7 100755
--- a/dgit
+++ b/dgit
@@ -1699,6 +1699,11 @@ sub prep_ud (;$) {
 sub mktree_in_ud_here () {
     runcmd qw(git init -q);
     runcmd qw(git config gc.auto 0);
+    foreach my $copy (qw(user.email user.name user.useConfigOnly)) {
+	my $v = $gitcfgs{local}{$copy};
+	next unless $v;
+	runcmd qw(git config), $copy, $_ foreach @$v;
+    }
     rmtree('.git/objects');
     symlink '../../../../objects','.git/objects' or die $!;
     setup_gitattrs(1);
@@ -1990,7 +1995,14 @@ sub make_commit_text ($) {
 sub clogp_authline ($) {
     my ($clogp) = @_;
     my $author = getfield $clogp, 'Maintainer';
-    $author =~ s#,.*##ms;
+    if ($author =~ m/^[^"\@]+\,/) {
+	# single entry Maintainer field with unquoted comma
+	$author = ($& =~ y/,//rd).$'; # strip the comma
+    }
+    # git wants a single author; any remaining commas in $author
+    # are by now preceded by @ (or ").  It seems safer to punt on
+    # "..." for now rather than attempting to dequote or something.
+    $author =~ s#,.*##ms unless $author =~ m/"/;
     my $date = cmdoutput qw(date), '+%s %z', qw(-d), getfield($clogp,'Date');
     my $authline = "$author $date";
     $authline =~ m/$git_authline_re/o or
@@ -2312,6 +2324,7 @@ sub generate_commits_from_dsc () {
 
     my $authline = clogp_authline $clogp;
     my $changes = getfield $clogp, 'Changes';
+    $changes =~ s/^\n//; # Changes: \n
     my $cversion = getfield $clogp, 'Version';
 
     if (@tartrees) {
@@ -3799,6 +3812,7 @@ sub pseudomerge_version_check ($$) {
 	} else {
 	    my $v = $i_arch_v->[0];
 	    progress "Checking package changelog for archive version $v ...";
+	    my $cd;
 	    eval {
 		my @xa = ("-f$v", "-t$v");
 		my $vclogp = parsechangelog @xa;
@@ -3809,12 +3823,17 @@ sub pseudomerge_version_check ($$) {
 		};
 		my $cv = $gf->('Version');
 		infopair_cond_equal($i_arch_v, $cv);
+		$cd = $gf->('Distribution');
 	    };
 	    if ($@) {
 		$@ =~ s/^dgit: //gm;
 		fail "$@".
 		    "Perhaps debian/changelog does not mention $v ?";
 	    }
+	    fail <<END if $cd->[0] =~ m/UNRELEASED/;
+$cd->[1] is $cd->[0]
+Your tree seems to based on earlier (not uploaded) $v.
+END
 	}
     }
     
@@ -4423,7 +4442,12 @@ sub cmd_clone {
 }
 
 sub branchsuite () {
-    my $branch = cmdoutput_errok @git, qw(symbolic-ref HEAD);
+    my @cmd = (@git, qw(symbolic-ref -q HEAD));
+    my $branch = cmdoutput_errok @cmd;
+    if (!defined $branch) {
+	$?==256 or failedcmd @cmd;
+	return undef;
+    }
     if ($branch =~ m#$lbranch_re#o) {
 	return $1;
     } else {