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: Mention #800060
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index 50011cce1bde6c9ea94ce28dd0530a99db2b09f3..34152eec985ae6aeb36b1b259a2498262025887d 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-2136,6
+2136,8
@@
sub mergeinfo_version ($) {
}
sub fetch_from_archive () {
}
sub fetch_from_archive () {
+ ensure_setup_existing_tree();
+
# Ensures that lrref() is what is actually in the archive, one way
# or another, according to us - ie this client's
# appropritaely-updated archive view. Also returns the commit id.
# Ensures that lrref() is what is actually in the archive, one way
# or another, according to us - ie this client's
# appropritaely-updated archive view. Also returns the commit id.
@@
-2535,6
+2537,13
@@
sub setup_useremail (;$) {
$setup->('name', 'DEBFULLNAME');
}
$setup->('name', 'DEBFULLNAME');
}
+sub ensure_setup_existing_tree () {
+ my $k = "remote.$remotename.skipdefaultupdate";
+ my $c = git_get_config $k;
+ return if defined $c;
+ set_local_git_config $k, 'true';
+}
+
sub setup_new_tree () {
setup_mergechangelogs();
setup_useremail();
sub setup_new_tree () {
setup_mergechangelogs();
setup_useremail();
@@
-3221,7
+3230,8
@@
END
push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
}
push @pushrefs, $forceflag."refs/tags/$tw->{Tag}";
}
- runcmd_ordryrun @git, qw(push),access_giturl(), @pushrefs;
+ runcmd_ordryrun @git,
+ qw(-c push.followTags=false push), access_giturl(), @pushrefs;
runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
supplementary_message(<<'END');
runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), $dgithead;
supplementary_message(<<'END');
@@
-4671,6
+4681,10
@@
sub cmd_build {
printdone "build successful\n";
}
printdone "build successful\n";
}
+sub pre_gbp_build {
+ $quilt_mode //= 'gbp';
+}
+
sub cmd_gbp_build {
my @dbp = @dpkgbuildpackage;
sub cmd_gbp_build {
my @dbp = @dpkgbuildpackage;
@@
-5101,6
+5115,9
@@
if (!@ARGV) {
my $cmd = shift @ARGV;
$cmd =~ y/-/_/;
my $cmd = shift @ARGV;
$cmd =~ y/-/_/;
+my $pre_fn = ${*::}{"pre_$cmd"};
+$pre_fn->() if $pre_fn;
+
if (!defined $rmchanges) {
local $access_forpush;
$rmchanges = access_cfg_bool(0, 'rm-old-changes');
if (!defined $rmchanges) {
local $access_forpush;
$rmchanges = access_cfg_bool(0, 'rm-old-changes');