Avoid using absolute paths when staging location log, as that can confuse git when a remote's path contains a symlink. Closes: #621386
This was a real PITA to fix, since location logs can be staged in both the current repo, as well as in local remote's repos, in which case the cwd will not be in the repo. And git add needs different params in both cases, when absolute paths are not used. In passing, git annex fsck now stages location log fixes.
This commit is contained in:
parent
e433c6f0bb
commit
76911a446a
5 changed files with 43 additions and 27 deletions
|
@ -64,11 +64,11 @@ verifyLocationLog key file = do
|
|||
|
||||
case (present, u `elem` uuids) of
|
||||
(True, False) -> do
|
||||
fix g u ValuePresent
|
||||
fix u ValuePresent
|
||||
-- There is no data loss, so do not fail.
|
||||
return True
|
||||
(False, True) -> do
|
||||
fix g u ValueMissing
|
||||
fix u ValueMissing
|
||||
warning $
|
||||
"** Based on the location log, " ++ file
|
||||
++ "\n** was expected to be present, " ++
|
||||
|
@ -77,7 +77,6 @@ verifyLocationLog key file = do
|
|||
_ -> return True
|
||||
|
||||
where
|
||||
fix g u s = do
|
||||
fix u s = do
|
||||
showNote "fixing location log"
|
||||
_ <- liftIO $ logChange g key u s
|
||||
return ()
|
||||
logStatusFor u key s
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue