1 files changed, 4 insertions, 1 deletions
diff --git a/dgit b/dgit
index f33aab8..a0d2e0a 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;