diff options
| -rw-r--r-- | Command/Log.hs | 2 | ||||
| -rw-r--r-- | Test.hs | 5 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | doc/bugs/log_fails_with_-raw_error.mdwn | 2 | ||||
| -rw-r--r-- | doc/bugs/log_fails_with_-raw_error/comment_1_dcb3ff1a076c81472cd471254946a868._comment | 8 |
5 files changed, 22 insertions, 1 deletions
diff --git a/Command/Log.hs b/Command/Log.hs index 9ee7f8543..495c43c5a 100644 --- a/Command/Log.hs +++ b/Command/Log.hs @@ -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 ++ @@ -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" diff --git a/debian/changelog b/debian/changelog index 4f354543d..80bf514ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 diff --git a/doc/bugs/log_fails_with_-raw_error.mdwn b/doc/bugs/log_fails_with_-raw_error.mdwn index 86abd5dfb..553c507a1 100644 --- a/doc/bugs/log_fails_with_-raw_error.mdwn +++ b/doc/bugs/log_fails_with_-raw_error.mdwn @@ -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]] diff --git a/doc/bugs/log_fails_with_-raw_error/comment_1_dcb3ff1a076c81472cd471254946a868._comment b/doc/bugs/log_fails_with_-raw_error/comment_1_dcb3ff1a076c81472cd471254946a868._comment new file mode 100644 index 000000000..efdf0dccb --- /dev/null +++ b/doc/bugs/log_fails_with_-raw_error/comment_1_dcb3ff1a076c81472cd471254946a868._comment @@ -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. +"""]] |