diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-04-07 13:14:53 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-04-07 13:14:53 -0400 |
| commit | 4a332477b2a7cf56a6c71e4847c3a0a7bc721d41 (patch) | |
| tree | da436f39edca06ef95366421ec82ef63221e5f3b | |
| parent | e3118ba722c7c7f7438f5149aa644744f943ea2c (diff) | |
enableremote: When enabling a non-special remote, param=value parameters can't be used, so error out if any are provided.
This commit was sponsored by Riku Voipio.
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | Command/EnableRemote.hs | 5 | ||||
| -rw-r--r-- | doc/bugs/git_annex_enableremote_ignoring_encryption_changes/comment_1_e3924c02186d962e4dc1e1af8e968891._comment | 13 |
3 files changed, 19 insertions, 1 deletions
@@ -12,6 +12,8 @@ git-annex (6.20170322) UNRELEASED; urgency=medium necessary because as feared, the extra -n parameter that git-annex passes breaks uses of these environment variables that expect exactly the parameters that git passes. + * enableremote: When enabling a non-special remote, param=value + parameters can't be used, so error out if any are provided. -- Joey Hess <id@joeyh.name> Wed, 29 Mar 2017 12:41:46 -0400 diff --git a/Command/EnableRemote.hs b/Command/EnableRemote.hs index 96efce39c..3addd87d7 100644 --- a/Command/EnableRemote.hs +++ b/Command/EnableRemote.hs @@ -39,7 +39,10 @@ start (name:rest) = go =<< filter matchingname <$> Annex.fromRepo Git.remotes matchingname r = Git.remoteName r == Just name go [] = startSpecialRemote name (Logs.Remote.keyValToConfig rest) =<< Annex.SpecialRemote.findExisting name - go (r:_) = startNormalRemote name r + go (r:_) + | null rest = startNormalRemote name r + | otherwise = giveup $ + "That is a normal git remote; passing these parameters does not make sense: " ++ unwords rest startNormalRemote :: Git.RemoteName -> Git.Repo -> CommandStart startNormalRemote name r = do diff --git a/doc/bugs/git_annex_enableremote_ignoring_encryption_changes/comment_1_e3924c02186d962e4dc1e1af8e968891._comment b/doc/bugs/git_annex_enableremote_ignoring_encryption_changes/comment_1_e3924c02186d962e4dc1e1af8e968891._comment new file mode 100644 index 000000000..9d0193d9b --- /dev/null +++ b/doc/bugs/git_annex_enableremote_ignoring_encryption_changes/comment_1_e3924c02186d962e4dc1e1af8e968891._comment @@ -0,0 +1,13 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 1""" + date="2017-04-07T16:54:19Z" + content=""" +This does not happen when I do the same thing with a directory special +remote. + +I do reproduce it with gcrypt. It must be missing a call to the code that +handles keyid+=. + +Thanks for an excellent bug report! +"""]] |