diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-08-11 18:40:59 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-08-11 18:40:59 -0400 |
| commit | 88aeb849f620a13da47508045daae461a223c997 (patch) | |
| tree | a93b1d67d5fe887c7e958d9cffbea3d7014e496a /Annex | |
| parent | 96705a943615528f79a121e6e94101d5852ba44f (diff) | |
Fix setting/setting/viewing metadata that contains unicode or other special characters, when in a non-unicode locale.
Oh boy, not again. So, another place that the filesystem encoding needs to
be applied. Yay.
In passing, I changed decodeBS so if a NUL is embedded in the input, the
resulting FilePath doesn't get truncated at that NUL. This was needed to
make prop_b64_roundtrips pass, and on reviewing the callers of decodeBS, I
didn't see any where this wouldn't make sense. When a FilePath is used to
operate on the filesystem, it'll get truncated at a NUL anyway, whereas if
a String is being used for something else, it might conceivably have a NUL
in it, and we wouldn't want it to get truncated when going through
decodeBS.
(NB: There may be a speed impact from this change.)
Diffstat (limited to 'Annex')
| -rw-r--r-- | Annex/TaggedPush.hs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Annex/TaggedPush.hs b/Annex/TaggedPush.hs index 642d4db0b..eff8d6e0e 100644 --- a/Annex/TaggedPush.hs +++ b/Annex/TaggedPush.hs @@ -45,7 +45,6 @@ fromTaggedBranch b = case split "/" $ Git.fromRef b of ("refs":"synced":u:_base) -> Just (toUUID u, Nothing) _ -> Nothing - where taggedPush :: UUID -> Maybe String -> Git.Ref -> Remote -> Git.Repo -> IO Bool taggedPush u info branch remote = Git.Command.runBool |