summaryrefslogtreecommitdiff
path: root/dgit
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2013-08-28 23:36:54 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2013-08-28 23:36:54 +0100
commit92e3078f04dd4204962a38e3875a50cfc4fd23ce (patch)
tree91d4a086c7ab49d820be736cb22b1840eca51ad4 /dgit
parent0a6e52869abeda15e14577ea5a4db58301afd005 (diff)
Fix some bugs in dgit fetch --dry-run which made dgit push --dry-run often not work at all.
Diffstat (limited to 'dgit')
-rwxr-xr-xdgit5
1 files changed, 2 insertions, 3 deletions
diff --git a/dgit b/dgit
index 35c02af..0a599b0 100755
--- a/dgit
+++ b/dgit
@@ -680,8 +680,7 @@ sub is_fast_fwd ($$) {
}
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 () {
@@ -768,7 +767,7 @@ sub clone ($) {
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";
}