diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-07-14 16:56:06 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-07-14 17:15:37 -0400 |
| commit | ded259112449f592bc42207e89c82268f3795f12 (patch) | |
| tree | 6a3e624445cbd063e32f3f0247a552f0ff47074a /Upgrade | |
| parent | 0c46cbab09af8cc8761668885e58944d397b856d (diff) | |
unannex: Clean up use of git commit -a.
This was more complex than would be expected. unannex has to use git commit -a
since it's removing files from git; git commit filelist won't do.
Allow commands to be added to the Git queue that have no associated files,
and run such commands once.
Diffstat (limited to 'Upgrade')
| -rw-r--r-- | Upgrade/V1.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Upgrade/V1.hs b/Upgrade/V1.hs index c0bbeebaf..165a48262 100644 --- a/Upgrade/V1.hs +++ b/Upgrade/V1.hs @@ -104,7 +104,7 @@ updateSymlinks = do link <- calcGitLink f k liftIO $ removeFile f liftIO $ createSymbolicLink link f - AnnexQueue.add "add" [Param "--"] f + AnnexQueue.add "add" [Param "--"] [f] moveLocationLogs :: Annex () moveLocationLogs = do @@ -134,9 +134,9 @@ moveLocationLogs = do old <- readLog f new <- readLog dest writeLog dest (old++new) - AnnexQueue.add "add" [Param "--"] dest - AnnexQueue.add "add" [Param "--"] f - AnnexQueue.add "rm" [Param "--quiet", Param "-f", Param "--"] f + AnnexQueue.add "add" [Param "--"] [dest] + AnnexQueue.add "add" [Param "--"] [f] + AnnexQueue.add "rm" [Param "--quiet", Param "-f", Param "--"] [f] oldlog2key :: FilePath -> Maybe (FilePath, Key) oldlog2key l = |