log: Fix reversion introduced in version 5.20150528 that broke this command.

This commit is contained in:
Joey Hess 2015-07-02 12:53:38 -04:00
parent 3d0a4a0a67
commit 833cf5fff9
5 changed files with 22 additions and 1 deletions

View file

@ -151,7 +151,7 @@ getLog key os = do
[ Param "log"
, Param "-z"
, Param "--pretty=format:%ct"
, Param "-raw"
, Param "--raw"
, Param "--abbrev=40"
, Param "--remove-empty"
] ++ os ++

View file

@ -180,6 +180,7 @@ unitTests :: String -> TestTree
unitTests note = testGroup ("Unit Tests " ++ note)
[ testCase "add sha1dup" test_add_sha1dup
, testCase "add extras" test_add_extras
, testCase "log" test_log
, testCase "import" test_import
, testCase "reinject" test_reinject
, testCase "unannex (no copy)" test_unannex_nocopy
@ -282,6 +283,10 @@ test_add_extras = intmpclonerepo $ do
annexed_present wormannexedfile
checkbackend wormannexedfile backendWORM
test_log :: Assertion
test_log = intmpclonerepo $ do
git_annex "log" [annexedfile] @? "log failed"
test_import :: Assertion
test_import = intmpclonerepo $ Utility.Tmp.withTmpDir "importtest" $ \importdir -> do
(toimport1, importf1, imported1) <- mktoimport importdir "import1"

6
debian/changelog vendored
View file

@ -1,3 +1,9 @@
git-annex (5.20150618) UNRELEASED; urgency=medium
* log: Fix reversion introduced in version 5.20150528 that broke this command.
-- Joey Hess <id@joeyh.name> Thu, 02 Jul 2015 12:31:14 -0400
git-annex (5.20150617) unstable; urgency=medium
* Now supports git annex sync --all --content to sync all versions of all

View file

@ -43,3 +43,5 @@ upgrade supported from repository versions: 0 1 2 4
"""]]
--[[anarcat]]
> Fixed to use --raw, and added a test case. [[done]] --[[Joey]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="joey"
subject="""comment 1"""
date="2015-07-02T16:18:09Z"
content="""
I can reproduce this with debian unstable. It is a reversion introduced
in version 5.20150528 of git-annex.
"""]]