diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2013-08-16 15:01:12 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2013-08-16 15:01:12 +0100 |
commit | 2b11580e5274e1919fd21da4d0fa2dd19b2c0fea (patch) | |
tree | 8ae1436558fba87ed4310d35234a7837fd08743a | |
parent | 39c6c123ab730d42ec7c9ed01c30e0175c7691e7 (diff) |
dry run fetch really does not update ref
-rw-r--r-- | TODO | 2 | ||||
-rwxr-xr-x | dgit | 3 | ||||
-rw-r--r-- | dgit.1 | 7 |
3 files changed, 6 insertions, 6 deletions
@@ -1,5 +1,3 @@ -abolish fetch dry run - config for repo locations push should push to dgit remote (other branches) @@ -346,7 +346,8 @@ sub is_fast_fwd ($$) { } sub git_fetch_us () { - runcmd_ordryrun @git, qw(fetch),$remotename,fetchspec(); + die "cannot dry run with fetch" if $dryrun; + runcmd @git, qw(fetch),$remotename,fetchspec(); } sub fetch_from_archive () { @@ -95,9 +95,7 @@ the remote tracking branch for dgit/suite. .TP .BR --dry-run | -n Go through the motions, fetching all information needed, but do not -actually update the output(s). For fetch and pull, dgit determines -which git commit corresponds to the archive but does not update -remotes/dgit/dgit/suite or do any merge. For push, dgit does +actually update the output(s). For push, dgit does the required checks and leaves the new .dsc in a temporary file, but does not sign, tag, push or upload. .TP @@ -167,3 +165,6 @@ The error messages are often unhelpfully terse and tend to refer to line numbers in dgit. The option parser requires values to be cuddled to the option name. + +--dry-run often does not work with fetch, even though this is a +logically plausible request. (It fails, instead.) |