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

reinject: Add a sanity check for using an annexed file as the source file.

Browse source
This commit is contained in:
Joey Hess 2011-12-12 13:43:52 -04:00
commit 6edaabd040
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Command/Reinject.hs
View file

@ -24,8 +24,9 @@ start :: [FilePath] -> CommandStart
start (src:dest:[])
| src == dest = stop
| otherwise = do
showStart "reinject" dest
next $ whenAnnexed (perform src) dest
ifAnnexed src
(error $ "cannot used annexed file as src: " ++ src)
(next $ whenAnnexed (perform src) dest)
start _ = error "specify a src file and a dest file"
perform :: FilePath -> FilePath -> (Key, Backend Annex) -> CommandPerform

1
debian/changelog vendored
View file

@ -1,6 +1,7 @@
git-annex (3.20111212) UNRELEASED; urgency=low
* Union merge now finds the least expensive way to represent the merge.
* reinject: Add a sanity check for using an annexed file as the source file.
-- Joey Hess <joeyh@debian.org> Mon, 12 Dec 2011 01:57:49 -0400