X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=0adf30224df5d4c34d6e5f3647d6d9beb7534b10;hb=dac79ba60f22d978a2b3f834358c7f865bcf131a;hp=3f9dd97375a6cf00a1a22276fe8ee16f5dd24645;hpb=dc3ada23508f1c40692e15fcb0cf5e06fd541104;p=dgit.git

diff --git a/dgit b/dgit
index 3f9dd973..0adf3022 100755
--- a/dgit
+++ b/dgit
@@ -236,7 +236,7 @@ our %defcfg = ('dgit.default.distro' => 'debian',
 	       'dgit-distro.debian.sshdakls-host' => 'coccia.debian.org',
 	       'dgit-distro.debian.sshdakls-dir' =>
 	           '/srv/ftp-master.debian.org/ftp/dists',
-	       'dgit-distro.debian.mirror' => 'http://http.debian.net/debian/');
+	       'dgit-distro.debian.mirror' => 'http://ftp.debian.org/debian/');
 
 sub cfg {
     foreach my $c (@_) {
@@ -763,7 +763,7 @@ sub commit_quilty_patch () {
     my $bad=0;
     foreach my $l (split /\n/, $output) {
 	next unless $l =~ m/\S/;
-	if ($l =~ m{^\?\? (.pc|debian/patches)}) {
+	if ($l =~ m{^(?:\?\?| M) (.pc|debian/patches)}) {
 	    $adds{$1}++;
 	} else {
 	    print STDERR "git status: $l\n";
@@ -992,18 +992,23 @@ sub build_maybe_quilt_fixup () {
     chomp;
     return unless madformat($_);
     # sigh
+    my $clogp = parsechangelog();
+    my $version = getfield $clogp, 'Version';
+    my $author = getfield $clogp, 'Maintainer';
     my $headref = rev_parse('HEAD');
     my $time = time;
+    my $ncommits = 3;
     my $patchname = "auto-$version-$headref-$time";
-    my $author = cmdoutput @git, qw(log -n1), '--pretty=format:%an <%ae>';
-    my $msg = cmdoutput @git, qw(log -n1), "--pretty=format:%s\n%b";
+    my $msg = cmdoutput @git, qw(log), "-n$ncommits";
     my $descfn = ".git/dgit/quilt-description.tmp";
     open O, '>', $descfn or die "$descfn: $!";
     $msg =~ s/\n/\n /g;
     $msg =~ s/^\s+$/ ./mg;
     print O <<END or die $!;
-Description: $msg
- [generated from git commit $headref]
+Description: Automatically generated patch ($clogp->{Version})
+ Last (up to) $ncommits git changes, FYI:
+ .
+ $msg
 Author: $author
 
 ---
@@ -1017,7 +1022,7 @@ END
 	runcmd_ordryrun @dpkgsource, qw(--commit .), $patchname;
     }
 
-    if (!open P, '>', ".pc/applied-patches") {
+    if (!open P, '>>', ".pc/applied-patches") {
 	$!==&ENOENT or die $!;
     } else {
 	close P;