diff options
| -rw-r--r-- | Utility/SshConfig.hs | 3 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | doc/bugs/git-annex_rewrites_.ssh__47__config.mdwn | 2 | ||||
| -rw-r--r-- | doc/bugs/git-annex_rewrites_.ssh__47__config/comment_5_4316aff6470006183e91004946387141._comment | 11 |
4 files changed, 17 insertions, 1 deletions
diff --git a/Utility/SshConfig.hs b/Utility/SshConfig.hs index 57e4f0f38..cd15c47ce 100644 --- a/Utility/SshConfig.hs +++ b/Utility/SshConfig.hs @@ -82,7 +82,8 @@ genSshConfig = unlines . concatMap gen gen (GlobalConfig s) = [setting s] gen (HostConfig h cs) = ("Host " ++ h) : map (either comment setting) cs - setting (SshSetting indent k v) = indent ++ k ++ " " ++ v + setting (SshSetting indent k v) = indent ++ k ++ + if null v then "" else " " ++ v comment (Comment indent c) = indent ++ c findHostConfigKey :: SshConfig -> Key -> Maybe Value diff --git a/debian/changelog b/debian/changelog index 9233d3073..17fd70a0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ git-annex (5.20150917) UNRELEASED; urgency=medium In particular, storageclass=STANDARD_IA to use Amazon's new Infrequently Accessed storage, and storageclass=NEARLINE to use Google's NearLine storage. + * Improve ~/.ssh/config modification code to not add trailing spaces + to lines it cannot parse. -- Joey Hess <id@joeyh.name> Wed, 16 Sep 2015 12:23:33 -0400 diff --git a/doc/bugs/git-annex_rewrites_.ssh__47__config.mdwn b/doc/bugs/git-annex_rewrites_.ssh__47__config.mdwn index e76e1870d..325a4c351 100644 --- a/doc/bugs/git-annex_rewrites_.ssh__47__config.mdwn +++ b/doc/bugs/git-annex_rewrites_.ssh__47__config.mdwn @@ -13,3 +13,5 @@ git-annex-5.20140717-8.fc24.x86_64 ### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders) Has worked wonders for syncing keepass files between devices; just now setting up assistant to do things automatically though :) . + +> [[fixed|done]] --[[Joey]] diff --git a/doc/bugs/git-annex_rewrites_.ssh__47__config/comment_5_4316aff6470006183e91004946387141._comment b/doc/bugs/git-annex_rewrites_.ssh__47__config/comment_5_4316aff6470006183e91004946387141._comment new file mode 100644 index 000000000..726397fcb --- /dev/null +++ b/doc/bugs/git-annex_rewrites_.ssh__47__config/comment_5_4316aff6470006183e91004946387141._comment @@ -0,0 +1,11 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 5""" + date="2015-09-22T16:03:42Z" + content=""" +Well, it does seem legal to do that -- man page says a pattern can be 0 or +more characters, and you have 0. + +I've put in a fix in the generator to avoid adding whitespace in this +case. +"""]] |