mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

assistant: Fix bug that caused v6 pointer files to be annexed by the assistant.

Browse source
This commit is contained in:
Joey Hess 2016-05-16 13:36:36 -04:00
parent c61f038fc9
commit fb8ab2469d
Failed to extract signature
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Assistant/Threads/Watcher.hs
View file

@ -221,7 +221,11 @@ shouldRestage :: DaemonStatus -> Bool
shouldRestage ds = scanComplete ds || forceRestage ds
onAddUnlocked :: Bool -> GetFileMatcher -> Handler
onAddUnlocked = onAddUnlocked' False contentchanged addassociatedfile addlink samefilestatus
onAddUnlocked symlinkssupported matcher f fs = do
mk <- liftIO $ isPointerFile f
case mk of
Nothing -> onAddUnlocked' False contentchanged addassociatedfile addlink samefilestatus symlinkssupported matcher f fs
Just k -> addlink f k
where
addassociatedfile key file =
Database.Keys.addAssociatedFile key

2
debian/changelog vendored
View file

@ -6,6 +6,8 @@ git-annex (6.20160512) UNRELEASED; urgency=medium
* adjust: If the adjusted branch already exists, avoid overwriting it,
since it might contain changes that have not yet been propigated to the
original branch.
* assistant: Fix bug that caused v6 pointer files to be annexed by the
assistant.
-- Joey Hess <id@joeyh.name> Wed, 11 May 2016 16:08:38 -0400

2
doc/bugs/Central_annex_+_assistant_+_v6___61___weirdness__63__.mdwn
View file

@ -102,3 +102,5 @@ Everything up-to-date
### 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)
It seems to work really well on v5, but the v6 file "corruption" is difficult to recover from.
> [[fixed|done]] --[[Joey]]