chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Test suite: stunt Parse.pm: add comment about %options
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index a96f4711bb0d8c5fd7f3072bd3138b8b5733b489..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();