X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=a0d2e0a0f86034b6accf6fe81fb4f8556c65d9b3;hb=336354ae2894e7d677c0d80fff8fd54e275e025b;hp=f33aab8c0838fb93a0c7357a19ad1fd1563f6df1;hpb=af383382f97e6ab687b209e9117fe50dac6d37c8;p=dgit.git

diff --git a/dgit b/dgit
index f33aab8c..a0d2e0a0 100755
--- a/dgit
+++ b/dgit
@@ -165,6 +165,7 @@ our %opts_cfg_insertpos = map {
 } keys %opts_opt_map;
 
 sub parseopts_late_defaults();
+sub quiltify_trees_differ ($$;$$$);
 sub setup_gitattrs(;$);
 sub check_gitattrs($$);
 
@@ -397,7 +398,9 @@ sub branch_is_gdr ($) {
 	    return 0;
 	}
 	if ($tip_patches eq '' and
-	    !defined git_cat_file "$walk:debian") {
+	    !defined git_cat_file "$walk~:debian" and
+	    !quiltify_trees_differ "$walk~", $walk
+	   ) {
 	    # (gdr classification of parent: BreakwaterStart
 	    printdebug "branch_is_gdr  $walk unmarked BreakwaterStart YES\n";
 	    return 1;