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

fixed the double commits problem

Browse source
This commit is contained in:
Joey Hess 2012-06-10 18:29:05 -04:00
parent fc0dd79774
commit aae0ba1995
2 changed files with 84 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Command/Add.hs
View file

@ -94,9 +94,8 @@ undo file key e = do
src <- inRepo $ gitAnnexLocation key
liftIO $ moveFile src file
{- Creates the symlink to the annexed content, and also returns the link's
- text. -}
link :: FilePath -> Key -> Bool -> Annex FilePath
{- Creates the symlink to the annexed content. -}
link :: FilePath -> Key -> Bool -> Annex ()
link file key hascontent = handle (undo file key) $ do
l <- calcGitLink file key
liftIO $ createSymbolicLink l file
@ -110,8 +109,6 @@ link file key hascontent = handle (undo file key) $ do
mtime <- modificationTime <$> getFileStatus file
touch file (TimeSpec mtime) False
return l
{- Note: Several other commands call this, and expect it to
- create the symlink and add it. -}
cleanup :: FilePath -> Key -> Bool -> CommandCleanup