chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-debpush: check_treesame: Show diffstat when there is a diff
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index 0e0ff6575c3e79bc67227b809e36c876b53fb4f1..cde85468cfcad54ec99661f9d0ec0d02c2572c4e 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-4,7
+4,7
@@
#
# Copyright (C)2013-2019 Ian Jackson
# Copyright (C)2017-2019 Sean Whitton
#
# Copyright (C)2013-2019 Ian Jackson
# Copyright (C)2017-2019 Sean Whitton
-# Copyright (C)2019 Matthew Vernon /
Sanger Institute
+# Copyright (C)2019 Matthew Vernon /
Genome Research Limited
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@
-117,7
+117,6
@@
our $rewritemap = 'dgit-rewrite/map';
our @dpkg_source_ignores = qw(-i(?:^|/)\.git(?:/|$) -I.git);
our @dpkg_source_ignores = qw(-i(?:^|/)\.git(?:/|$) -I.git);
-our (@git) = qw(git);
our (@dget) = qw(dget);
our (@curl) = (qw(curl --proto-redir), '-all,http,https', qw(-L));
our (@dput) = qw(dput);
our (@dget) = qw(dget);
our (@curl) = (qw(curl --proto-redir), '-all,http,https', qw(-L));
our (@dput) = qw(dput);
@@
-1835,7
+1834,7
@@
sub prep_ud () {
}
sub mktree_in_ud_here () {
}
sub mktree_in_ud_here () {
- playtree_setup
$gitcfgs{local}
;
+ playtree_setup
()
;
}
sub git_write_tree () {
}
sub git_write_tree () {
@@
-3883,14
+3882,9
@@
sub clone ($) {
record_maindir();
setup_new_tree();
clone_set_head();
record_maindir();
setup_new_tree();
clone_set_head();
- my $giturl = access_giturl(1);
- if (defined $giturl) {
- runcmd @git, qw(remote add), 'origin', $giturl;
- }
if ($hasgit) {
progress __ "fetching existing git history";
git_fetch_us();
if ($hasgit) {
progress __ "fetching existing git history";
git_fetch_us();
- runcmd_ordryrun_local @git, qw(fetch origin);
} else {
progress __ "starting new git history";
}
} else {
progress __ "starting new git history";
}