From 68a9c867be31e71e9a1f23edd3ab6bf486f90bb4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Oct 2017 12:47:13 -0400 Subject: [PATCH] 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. --- Annex/Export.hs | 2 +- CHANGELOG | 1 + doc/bugs/Export_fails_for_files_directly_in_git_repo.mdwn | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Annex/Export.hs b/Annex/Export.hs index 0629c3dcce..b5be2efbad 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 diff --git a/CHANGELOG b/CHANGELOG index cec9f6e01f..929b8f98d6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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 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 439356d988..3d9a402ae4 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]]