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

bugfix: Pass --full-tree when using git ls-files to get a list of files on the git-annex branch, so it works when run in a subdirectory. This bug affected git-annex unused, and potentially also transitions running code and other things.

Browse source
This commit is contained in:
Joey Hess 2015-07-06 14:09:24 -04:00
parent c9c63b092e
commit 174da80ddc
4 changed files with 23 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Annex/Branch.hs
View file

@ -316,6 +316,7 @@ files = do
branchFiles :: Annex [FilePath] branchFiles :: Annex [FilePath]
branchFiles = withIndex $ inRepo $ Git.Command.pipeNullSplitZombie branchFiles = withIndex $ inRepo $ Git.Command.pipeNullSplitZombie
[ Param "ls-tree" [ Param "ls-tree"
, Param "--full-tree"
, Param "--name-only" , Param "--name-only"
, Param "-r" , Param "-r"
, Param "-z" , Param "-z"

4
debian/changelog vendored
View file

@ -12,6 +12,10 @@ git-annex (5.20150618) UNRELEASED; urgency=medium
* Brought back the setkey plumbing command that was removed in 2011, since * Brought back the setkey plumbing command that was removed in 2011, since
we found a use case for it. Note that the command's syntax was changed we found a use case for it. Note that the command's syntax was changed
for consistency. for consistency.
* bugfix: Pass --full-tree when using git ls-files to get a list of files
on the git-annex branch, so it works when run in a subdirectory.
This bug affected git-annex unused, and potentially also transitions
running code and other things.
-- Joey Hess <id@joeyh.name> Thu, 02 Jul 2015 12:31:14 -0400 -- Joey Hess <id@joeyh.name> Thu, 02 Jul 2015 12:31:14 -0400

2
doc/bugs/git-annex_unused_--from_s3_doesn__39__t.mdwn
View file

@ -27,3 +27,5 @@ arch linux x86_64
### Please provide any additional information below. ### Please provide any additional information below.
The S3 remote is encrypted with the default "hybrid" method The S3 remote is encrypted with the default "hybrid" method
> [[fixed|done]] --[[Joey]]

16
doc/bugs/git-annex_unused_--from_s3_doesn__39__t/comment_4_768cc5be3d9b53a45419d02f2cb25ec6._comment Normal file
View file

@ -0,0 +1,16 @@
[[!comment format=mdwn
username="joey"
subject="""comment 4"""
date="2015-07-06T18:00:53Z"
content="""
Analysis: To find the keys, it's using git ls-tree git-annex. When this is
run in a subdirectory, it only lists files in the branch located under that
subdirectory. Which is no files. It should pass --full-tree to avoid that
problem.
Pretty much everywhere git-annex uses ls-tree, it does pass --full-tree.
But not in this particular case. Anything using Annex.Branch.branchFiles or
Annex.Branch.files would be affected; that's limited to git-annex unused
and code that runs transitions. git-annex unused w/o --from could also be
affected, I think, perhaps it's harder to trigger that though.
"""]]