X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=d18cc73b000be7b6fefafb869f900d940e5bda09;hb=ef0c4cd40f2c8bd50ea252f7de56dae3b64eeced;hp=5c9cdc3e2a8d24819199c69d4f61b4735a18d78f;hpb=866feb162b8f7e84039ed80e206c0df0def5f6c5;p=dgit.git

diff --git a/dgit b/dgit
index 5c9cdc3e..d18cc73b 100755
--- a/dgit
+++ b/dgit
@@ -1975,12 +1975,12 @@ END
 	    if ($found_same) {
 		# in archive, delete from .changes if it's there
 		$changed{$file} = "removed" if
-		    $changes->{$fname} =~ s/^.* \Q$file\E$(?:)\n//m;
-	    } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)\n/m) {
+		    $changes->{$fname} =~ s/\n.* \Q$file\E$(?:)$//m;
+	    } elsif ($changes->{$fname} =~ m/^.* \Q$file\E$(?:)$/m) {
 		# not in archive, but it's here in the .changes
 	    } else {
 		my $dsc_data = getfield $dsc, $fname;
-		$dsc_data =~ m/^(.* \Q$file\E$)\n/m or die "$dsc_data $file ?";
+		$dsc_data =~ m/^(.* \Q$file\E$)$/m or die "$dsc_data $file ?";
 		my $extra = $1;
 		$extra =~ s/ \d+ /$&$placementinfo /
 		    or die "$fname $extra >$dsc_data< ?"
@@ -2851,15 +2851,14 @@ sub mergeinfo_version ($) {
 
 sub fetch_from_archive_record_1 ($) {
     my ($hash) = @_;
-    runcmd @git, qw(update-ref -m), "dgit fetch $csuite",
-	    'DGIT_ARCHIVE', $hash;
+    runcmd git_update_ref_cmd "dgit fetch $csuite", 'DGIT_ARCHIVE', $hash;
     cmdoutput @git, qw(log -n2), $hash;
     # ... gives git a chance to complain if our commit is malformed
 }
 
 sub fetch_from_archive_record_2 ($) {
     my ($hash) = @_;
-    my @upd_cmd = (@git, qw(update-ref -m), 'dgit fetch', lrref(), $hash);
+    my @upd_cmd = (git_update_ref_cmd 'dgit fetch', lrref(), $hash);
     if (act_local()) {
 	cmdoutput @upd_cmd;
     } else {
@@ -3850,7 +3849,7 @@ sub maybe_split_brain_save ($$$) {
     # => message fragment "$saved" describing disposition of $dgitview
     return "commit id $dgitview" unless defined $split_brain_save;
     my @cmd = (shell_cmd 'cd "$1"; shift', $maindir,
-	       @git, qw(update-ref -m),
+	       git_update_ref_cmd
 	       "dgit --dgit-view-save $msg HEAD=$headref",
 	       $split_brain_save, $dgitview);
     runcmd @cmd;
@@ -4050,7 +4049,7 @@ sub plain_overwrite_pseudomerge ($$$) {
 	$clogp, $head, $archive_hash, $i_arch_v,
 	"dgit", $m;
 
-    runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
+    runcmd git_update_ref_cmd $m, 'HEAD', $r, $head;
 
     progress "Make pseudo-merge of $i_arch_v->[0] into your HEAD.";
     return $r;
@@ -4496,7 +4495,7 @@ END
 
     runcmd_ordryrun @git,
 	qw(-c push.followTags=false push), access_giturl(), @pushrefs;
-    runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
+    runcmd_ordryrun git_update_ref_cmd 'dgit push', lrref(), $dgithead;
 
     supplementary_message(<<'END');
 Push failed, while obtaining signatures on the .changes and .dsc.
@@ -6437,7 +6436,7 @@ sub cmd_quilt_fixup {
 
 sub import_dsc_result {
     my ($dstref, $newhash, $what_log, $what_msg) = @_;
-    my @cmd = (@git, qw(update-ref -m), $what_log, $dstref, $newhash);
+    my @cmd = (git_update_ref_cmd $what_log, $dstref, $newhash);
     runcmd @cmd;
     check_gitattrs($newhash, "source tree");