chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New manpage section on FILES IN THE SOURCE PACKAGE BUT NOT IN GIT. Closes: #721186.
[dgit.git]
/
dgit
diff --git
a/dgit
b/dgit
index 35c02afc0bcce12867bec7688e7ee9d29abfb22d..353c2e5c6a0b1dd64809bb7d6576aee43cd6d215 100755
(executable)
--- a/
dgit
+++ b/
dgit
@@
-680,8
+680,7
@@
sub is_fast_fwd ($$) {
}
sub git_fetch_us () {
}
sub git_fetch_us () {
- badusage "cannot dry run with fetch" if $dryrun;
- runcmd @git, qw(fetch),access_giturl(),fetchspec();
+ runcmd_ordryrun @git, qw(fetch),access_giturl(),fetchspec();
}
sub fetch_from_archive () {
}
sub fetch_from_archive () {
@@
-768,7
+767,7
@@
sub clone ($) {
if (check_for_git()) {
print "fetching existing git history\n";
git_fetch_us();
if (check_for_git()) {
print "fetching existing git history\n";
git_fetch_us();
- runcmd @git, qw(fetch origin);
+ runcmd
_ordryrun
@git, qw(fetch origin);
} else {
print "starting new git history\n";
}
} else {
print "starting new git history\n";
}
@@
-912,6
+911,7
@@
sub dopush () {
create_remote_git_repo();
}
runcmd_ordryrun @git, qw(push),access_giturl(),"HEAD:".rrref();
create_remote_git_repo();
}
runcmd_ordryrun @git, qw(push),access_giturl(),"HEAD:".rrref();
+ runcmd_ordryrun @git, qw(update-ref -m), 'dgit push', lrref(), 'HEAD';
if (!$dryrun) {
rename "../$dscfn.tmp","../$dscfn" or die "$dscfn $!";
} else {
if (!$dryrun) {
rename "../$dscfn.tmp","../$dscfn" or die "$dscfn $!";
} else {