diff options
| -rw-r--r-- | Command/Reinject.hs | 5 | ||||
| -rw-r--r-- | debian/changelog | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Command/Reinject.hs b/Command/Reinject.hs index cfa0655ef..906f7c517 100644 --- a/Command/Reinject.hs +++ b/Command/Reinject.hs @@ -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 diff --git a/debian/changelog b/debian/changelog index db23decbb..5fc01f9ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 |