X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=git-debrebase;h=a2a14ca654eaaef818a7081f773d4eac5ba10ed1;hb=32302c566f46426687ae9dcccec2f16ddeb56e4b;hp=35284d52ed8391436aed027f18e7cb9e089ef82b;hpb=3e041f7eae8fcac38d485e17df481b9b0aeef9b8;p=dgit.git

diff --git a/git-debrebase b/git-debrebase
index 35284d52..a2a14ca6 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -595,6 +595,7 @@ sub keycommits ($;$$$$) {
     my ($anchor, $breakwater);
     my $clogonly;
     my $cl;
+    my $found_pm;
     $fatal //= sub { fail $_[1]; };
     my $x = sub {
 	my ($cb, $tagsfx, $mainwhy, $xwhy) = @_;
@@ -634,12 +635,20 @@ sub keycommits ($;$$$$) {
 	    $breakwater = undef;
 	} elsif ($ty eq 'Pseudomerge' or
 		 $ty eq 'AddPatches') {
+	    my $found_pm = 1;
 	    $x->($furniture, (lc $ty),
 		 "found interchange bureaucracy commit ($ty)"," ($head)");
 	} elsif ($ty eq 'DgitImportUnpatched') {
-	    $x->($trouble, 'dgitimport',
-		 "found dgit dsc import ($head)");
-	    return (undef,undef);
+	    if ($found_pm) {
+		$x->($trouble, 'dgitimport',
+		     "found dgit dsc import"," ($head)");
+		return (undef,undef);
+	    } else {
+		$x->($fatal, 'unprocessable',
+		     "found bare dgit dsc import with no prior history",
+		     " ($head)");
+		return (undef,undef);
+	    }
 	} else {
 	    $x->($fatal, 'unprocessable',
 		 "found unprocessable commit, cannot cope: $cl->{Why}",
@@ -814,13 +823,12 @@ sub walk ($;$$) {
 		next;
 	    } else {
 		# Everything is from this import.  This kind of import
-		# is already in valid breakwater format, with the
-		# patches as commits.
-		printf $report " NoPM" if $report;
-		# last thing we processed will have been the first patch,
-		# if there is one; which is fine, so no need to rewrite
-		# on account of this import
-		$build_start->("ImportOrigin", $cur);
+		# is already nearly in valid breakwater format, with the
+		# patches as commits.  Unfortunately it contains
+		# debian/patches/.
+		printdebug "*** WALK BOMB bare dgit import\n";
+		$cl->{Why} = "bare dgit dsc import";
+		return $bomb->();
 	    }
 	    die "$ty ?";
         } else {
@@ -1190,8 +1198,8 @@ sub upstream_commitish_search ($$) {
     foreach my $tagpfx ('', 'v', 'upstream/') {
 	my $tag = $tagpfx.(dep14_version_mangle $upstream_version);
 	my $new_upstream = git_get_ref "refs/tags/$tag";
-	return $new_upstream if length $new_upstream;
 	push @$tried, $tag;
+	return $new_upstream if length $new_upstream;
     }
 }