chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changelog: Finalise 2.8
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index 911ad4ef4ccde2106ec7d3b4df4b1706504b8a22..7508fe15a2493295e01f0d3cc7587472cc51b2f1 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-4950,6
+4950,11
@@
END
if @unwanted;
}
if @unwanted;
}
+sub midbuild_checkchanges_vanilla ($) {
+ my ($wantsrc) = @_;
+ midbuild_checkchanges() if $wantsrc == 1;
+}
+
sub postbuild_mergechanges_vanilla ($) {
my ($wantsrc) = @_;
if ($wantsrc == 1) {
sub postbuild_mergechanges_vanilla ($) {
my ($wantsrc) = @_;
if ($wantsrc == 1) {
@@
-4966,6
+4971,7
@@
sub cmd_build {
my $wantsrc = massage_dbp_args \@dbp;
if ($wantsrc > 0) {
build_source();
my $wantsrc = massage_dbp_args \@dbp;
if ($wantsrc > 0) {
build_source();
+ midbuild_checkchanges_vanilla $wantsrc;
} else {
build_prep();
}
} else {
build_prep();
}
@@
-5000,6
+5006,7
@@
sub cmd_gbp_build {
if ($wantsrc > 0) {
build_source();
if ($wantsrc > 0) {
build_source();
+ midbuild_checkchanges_vanilla $wantsrc;
} else {
if (!$clean_using_builder) {
push @cmd, '--git-cleaner=true';
} else {
if (!$clean_using_builder) {
push @cmd, '--git-cleaner=true';