diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-10-30 12:47:13 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-10-30 12:47:13 -0400 |
| commit | 77b777aa4c5f640905725b42efe54bb7c469f8c0 (patch) | |
| tree | 7507292a70f5d59f0f06ce295a5bd3b7f18bbda9 | |
| parent | 5d7332826c6b85e41645039415f4151b57db94de (diff) | |
Fix exporting of non-annexed files to external special remotes.
Actual problem is the keyName was set to "Ref \"sha\"", which led to
this follow-on failure since it contained a space.
The bad data would also get into the export database when exporting to a
non-external special remote. Looking briefly at that, I don't think the bad
data will lead to anything more than a re-upload of the file content
now that the problem has been fixed.
This commit was sponsored by Peter Hogg on Patreon.
| -rw-r--r-- | Annex/Export.hs | 2 | ||||
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | doc/bugs/Export_fails_for_files_directly_in_git_repo.mdwn | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/Annex/Export.hs b/Annex/Export.hs index 0629c3dcc..b5be2efba 100644 --- a/Annex/Export.hs +++ b/Annex/Export.hs @@ -31,7 +31,7 @@ exportKey sha = mk <$> catKey sha where mk (Just k) = AnnexKey k mk Nothing = GitKey $ Key - { keyName = show sha + { keyName = Git.fromRef sha , keyVariety = SHA1Key (HasExt False) , keySize = Nothing , keyMtime = Nothing @@ -1,6 +1,7 @@ git-annex (6.20171027) UNRELEASED; urgency=medium * Fix export of subdir of a branch. + * Fix exporting of non-annexed files to external special remotes. -- Joey Hess <id@joeyh.name> Mon, 30 Oct 2017 12:01:45 -0400 diff --git a/doc/bugs/Export_fails_for_files_directly_in_git_repo.mdwn b/doc/bugs/Export_fails_for_files_directly_in_git_repo.mdwn index 439356d98..3d9a402ae 100644 --- a/doc/bugs/Export_fails_for_files_directly_in_git_repo.mdwn +++ b/doc/bugs/Export_fails_for_files_directly_in_git_repo.mdwn @@ -29,3 +29,4 @@ git-annex: export: 1 failed ### 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) Of course ;) All the time +> [[fixed|done]] --[[Joey]] |