fix bug in unlocked file scanner that skipped over executable unlocked files
This commit is contained in:
parent
481eb1de03
commit
d05a75e45a
4 changed files with 27 additions and 1 deletions
|
@ -170,7 +170,10 @@ scanAssociatedFiles = whenM (isJust <$> inRepo Git.Branch.current) $
|
|||
dropallassociated h = liftIO $ flip SQL.queueDb h $
|
||||
delete $ from $ \(_r :: SqlExpr (Entity SQL.Associated)) ->
|
||||
return ()
|
||||
isregfile i = Git.Types.toBlobType (Git.LsTree.mode i) == Just Git.Types.FileBlob
|
||||
isregfile i = case Git.Types.toBlobType (Git.LsTree.mode i) of
|
||||
Just Git.Types.FileBlob -> True
|
||||
Just Git.Types.ExecutableBlob -> True
|
||||
_ -> False
|
||||
add h i k = liftIO $ flip SQL.queueDb h $
|
||||
void $ insertUnique $ SQL.Associated
|
||||
(toIKey k)
|
||||
|
|
3
debian/changelog
vendored
3
debian/changelog
vendored
|
@ -10,6 +10,9 @@ git-annex (6.20160413) UNRELEASED; urgency=medium
|
|||
treat such a $HOME git repository as a git-annex repository.
|
||||
* webapp: Update url to add gitlab.com ssh key.
|
||||
(Psst GitLab.. cool urls don't change!)
|
||||
* Fix bug in v6 mode that prevented treating unlocked executable files
|
||||
as annexed. If you have such files, run git annex init --version=6
|
||||
to update the cache after upgrading to this version of git-annex.
|
||||
|
||||
-- Joey Hess <id@joeyh.name> Wed, 13 Apr 2016 13:30:32 -0400
|
||||
|
||||
|
|
|
@ -90,3 +90,4 @@ total 116
|
|||
### 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)
|
||||
|
||||
|
||||
> [[fixed|done]]
|
||||
|
|
|
@ -0,0 +1,19 @@
|
|||
[[!comment format=mdwn
|
||||
username="joey"
|
||||
subject="""comment 2"""
|
||||
date="2016-04-14T16:59:40Z"
|
||||
content="""
|
||||
I've fixed this bug. After upgrading to git-annex 6.20160414 or newer,
|
||||
if you have such files in your repository, you will need to force git-annex
|
||||
to update its list of unlocked files, by running:
|
||||
|
||||
git annex init --version=6
|
||||
|
||||
You may also need to run `git annex fsck` on the files to properly populate
|
||||
them with their content. Do it after the above command.
|
||||
|
||||
(There were also some bugs that lost the execute bit; fixed those too.)
|
||||
|
||||
(The comment about windows is not about this bug at all, but an entirely
|
||||
different, and already fixed bug.)
|
||||
"""]]
|
Loading…
Add table
Add a link
Reference in a new issue