changelog: start 8.5~

[dgit.git] / dgit

diff --git a/dgit b/dgit
index f33aab8c0838fb93a0c7357a19ad1fd1563f6df1..a0d2e0a0f86034b6accf6fe81fb4f8556c65d9b3 100755 (executable)
--- 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;