X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=dc423592e2b7b673c802158522416f8c269fc82b;hb=fb99aded391ed1fc792bf3eea3dcae2694060ea5;hp=b43308df271f5819bfab10b3e3dc69ca52c0f6e5;hpb=d51c2ac366c86d1dd3cc9ac04d5b3b14b1ff23c5;p=dgit.git

diff --git a/dgit b/dgit
index b43308df..dc423592 100755
--- a/dgit
+++ b/dgit
@@ -3727,6 +3727,7 @@ sub commit_quilty_patch () {
 	progress "nothing quilty to commit, ok.";
 	return;
     }
+    quiltify_nofix_bail "", " (wanted to commit patch update)";
     my @adds = map { s/[][*?\\]/\\$&/g; $_; } sort keys %adds;
     runcmd_ordryrun_local @git, qw(add -f), @adds;
     commit_admin <<END
@@ -3887,6 +3888,8 @@ sub pseudomerge_make_commit ($$$$ $$) {
 	: !length  $overwrite_version ? " --overwrite"
 	: " --overwrite=".$overwrite_version;
 
+    # Contributing parent is the first parent - that makes
+    # git rev-list --first-parent DTRT.
     my $pmf = dgit_privdir()."/pseudomerge";
     open MC, ">", $pmf or die "$pmf $!";
     print MC <<END or die $!;