X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=c2622ef7eb4ff7a949b77fcea66d1ad194a90213;hb=2046b269f987d70a6b89cbcd8926ef4931586706;hp=9e60cdac91bb892a392b96502a71199672d835f0;hpb=e4cb4198abba08ab41b4076a1e1d90cd17503f01;p=dgit.git

diff --git a/dgit b/dgit
index 9e60cdac..c2622ef7 100755
--- a/dgit
+++ b/dgit
@@ -1995,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
@@ -4359,9 +4366,9 @@ If you need to change the package, you must use a new version number.
 END
     if ($we_are_responder) {
 	my $dryrunsuffix = act_local() ? "" : ".tmp";
+	my @rfiles = ($dscpath, $changesfile);
 	responder_receive_files('signed-dsc-changes',
-				"$dscpath$dryrunsuffix",
-				"$changesfile$dryrunsuffix");
+				map { "$_$dryrunsuffix" } @rfiles);
     } else {
 	if (act_local()) {
 	    rename "$dscpath.tmp",$dscpath or die "$dscfn $!";
@@ -4435,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 {