git-debrebase expects a breakwater start commit to not make any
changes to upstream files. This means that sometimes dgit would fail
to make this check, and expect gdr to be able to make patches; but
then gdr would reject the branch.
It is still of course possible for dgit to ask gdr to make patches for
branches that the user does not *intend* to be handled by gdr, but
that is OK so long as gdr will DTRT.
Closes: #922446
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
} keys %opts_opt_map;
sub parseopts_late_defaults();
} keys %opts_opt_map;
sub parseopts_late_defaults();
+sub quiltify_trees_differ ($$;$$$);
sub setup_gitattrs(;$);
sub check_gitattrs($$);
sub setup_gitattrs(;$);
sub check_gitattrs($$);
return 0;
}
if ($tip_patches eq '' and
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;
# (gdr classification of parent: BreakwaterStart
printdebug "branch_is_gdr $walk unmarked BreakwaterStart YES\n";
return 1;