bugfix
This commit is contained in:
parent
cb1a0a387f
commit
ae4d20d157
1 changed files with 2 additions and 2 deletions
4
Core.hs
4
Core.hs
|
@ -75,14 +75,14 @@ gitAdd :: FilePath -> Maybe String -> Annex ()
|
||||||
gitAdd file commitmessage = do
|
gitAdd file commitmessage = do
|
||||||
nocommit <- Annex.flagIsSet NoCommit
|
nocommit <- Annex.flagIsSet NoCommit
|
||||||
if (nocommit)
|
if (nocommit)
|
||||||
then Annex.flagChange NeedCommit True
|
then return ()
|
||||||
else do
|
else do
|
||||||
g <- Annex.gitRepo
|
g <- Annex.gitRepo
|
||||||
liftIO $ Git.run g ["add", file]
|
liftIO $ Git.run g ["add", file]
|
||||||
if (isJust commitmessage)
|
if (isJust commitmessage)
|
||||||
then liftIO $ Git.run g ["commit", "-m",
|
then liftIO $ Git.run g ["commit", "-m",
|
||||||
(fromJust commitmessage), file]
|
(fromJust commitmessage), file]
|
||||||
else return ()
|
else Annex.flagChange NeedCommit True
|
||||||
|
|
||||||
{- Calculates the relative path to use to link a file to a key. -}
|
{- Calculates the relative path to use to link a file to a key. -}
|
||||||
calcGitLink :: FilePath -> Key -> Annex FilePath
|
calcGitLink :: FilePath -> Key -> Annex FilePath
|
||||||
|
|
Loading…
Reference in a new issue