X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=git-debrebase;h=524631787575bb459556a696c92850e040a8b970;hp=748b49bc2bc34c644bb06d357325789eb808513c;hb=bcca6a6dfc34e624274055ed1dd3fc3371a539a4;hpb=deb725236dab7d80249e72e871d069be25a607f8

diff --git a/git-debrebase b/git-debrebase
index 748b49bc..52463178 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -396,6 +396,15 @@ sub classify ($) {
 	# BreakwaterStart commits are also anchors in the terminology
 	# of git-debrebase(5), but they are untagged (and always
 	# manually generated).
+	#
+	# We cannot not tolerate any tagged linear commit (ie,
+	# BreakwaterStart commits tagged `[anchor:') because such a
+	# thing could result from an erroneous linearising raw git
+	# rebase of a merge anchor.  That would represent a corruption
+	# of the branch. and we want to detect and reject the results
+	# of such corruption before it makes it out anywhere.  If we
+	# reject it here then we avoid making the pseudomerge which
+	# would be needed to push it.
 
 	my $badanchor = sub { $unknown->("git-debrebase \`anchor' but @_"); };
 	@p == 2 or return $badanchor->("has other than two parents");
@@ -909,7 +918,7 @@ sub cmd_launder_v0 () {
 sub defaultcmd_rebase () {
     push @ARGV, @{ $opt_defaultcmd_interactive // [] };
     my ($tip,$breakwater) = do_launder_head 'launder for rebase';
-    runcmd @git, qw(rebase), @ARGV, $breakwater;
+    runcmd @git, qw(rebase), @ARGV, $breakwater if @ARGV;
 }
 
 sub cmd_analyse () {
@@ -1234,6 +1243,10 @@ sub cmd_new_upstream_v0 () {
  "[git-debrebase anchor: new upstream $new_upstream_version, merge]",
             ];
 
+	my $clogsignoff = cmdoutput qw(git show),
+	    '--pretty=format:%an <%ae>  %aD',
+	    $new_bw;
+
 	# Now we have to add a changelog stanza so the Debian version
 	# is right.
 	die if unlink "debian";
@@ -1250,7 +1263,7 @@ $p ($new_version) UNRELEASED; urgency=medium
 
   * Update to new upstream version $new_upstream_version.
 
- -- 
+ -- $clogsignoff
 
 END
 	close CN or die $!;