diff options
author | 2012-06-10 18:29:05 -0400 | |
---|---|---|
committer | 2012-06-10 18:41:05 -0400 | |
commit | aae0ba1995e258c4f4b83b40eb6324ec1f9baa05 (patch) | |
tree | 651b62523ad250cfed4f30edabd213f04da678b9 /Command/Add.hs | |
parent | fc0dd7977490917a1a87968ba117799bf04891bd (diff) |
fixed the double commits problem
Diffstat (limited to 'Command/Add.hs')
-rw-r--r-- | Command/Add.hs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Command/Add.hs b/Command/Add.hs index 3f39f8713..ccdff67ec 100644 --- a/Command/Add.hs +++ b/Command/Add.hs @@ -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 |