diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-09-22 12:59:56 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-09-22 13:00:18 -0400 |
| commit | f5c11a1acc4ded0ffcf0f9e6cf7c316750d61ee7 (patch) | |
| tree | f03531a1db9953d8ea114f9d58e8961b0d893cd3 /Annex/Direct.hs | |
| parent | 8bca37646e326a8409a2aa8d0c7e9001663f6050 (diff) | |
Improve robustness of direct mode merge, avoiding a crash if the index file is missing.
I couldn't find a good way to make an *empty* index file (zero byte file
won't do), so I punted and just don't make index.lock when there's no index
yet. This means some other git process could race and write an index file
at the same time as the merge is ongoing, in theory. Only happens in new
repos though.
Diffstat (limited to 'Annex/Direct.hs')
| -rw-r--r-- | Annex/Direct.hs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Annex/Direct.hs b/Annex/Direct.hs index d88dc43fb..35a5b5013 100644 --- a/Annex/Direct.hs +++ b/Annex/Direct.hs @@ -153,7 +153,7 @@ addDirect file cache = do - - A lock file is used to avoid races with any other caller of mergeDirect. - - - To avoid other git processes from making change to the index while our + - To avoid other git processes from making changes to the index while our - merge is in progress, the index lock file is used as the temp index - file. This is the same as what git does when updating the index - normally. @@ -162,7 +162,8 @@ mergeDirect :: Maybe Git.Ref -> Maybe Git.Ref -> Git.Branch -> Annex Bool -> Git mergeDirect startbranch oldref branch resolvemerge commitmode = exclusively $ do reali <- liftIO . absPath =<< fromRepo indexFile tmpi <- liftIO . absPath =<< fromRepo indexFileLock - liftIO $ copyFile reali tmpi + liftIO $ whenM (doesFileExist reali) $ + copyFile reali tmpi d <- fromRepo gitAnnexMergeDir liftIO $ do @@ -178,7 +179,8 @@ mergeDirect startbranch oldref branch resolvemerge commitmode = exclusively $ do mergeDirectCleanup d (fromMaybe Git.Sha.emptyTree oldref) mergeDirectCommit merged startbranch branch commitmode - liftIO $ rename tmpi reali + liftIO $ whenM (doesFileExist tmpi) $ + rename tmpi reali return r where |