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

fix --branch combined with --unlocked or --locked

Browse source 
Since it's using git ls-tree anyway, can just look at the file modes to see
if they're unlocked or are symlinks.
This commit is contained in:
Joey Hess 2021-03-02 13:46:12 -04:00
parent cbf94fd13d
commit a14001785e
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
4 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Command/Sync.hs
View file

@ -711,7 +711,7 @@ seekSyncContent o rs currbranch = do
pure Nothing
waitForAllRunningCommandActions
withKeyOptions' (keyOptions o) False
(return (commandAction . gokey mvar bloom))
(return (const (commandAction . gokey mvar bloom)))
(const noop)
(WorkTreeItems [])
waitForAllRunningCommandActions