githash 0.1.5.0 → 0.1.6.0
raw patch · 5 files changed
+20/−10 lines, 5 filesPVP ok
version bump matches the API change (PVP)
API changes (from Hackage documentation)
Files
- ChangeLog.md +6/−0
- githash.cabal +2/−4
- src/GitHash.hs +1/−1
- test/NormalRepoSpec.hs +5/−2
- test/RepoWithASubmoduleSpec.hs +6/−3
ChangeLog.md view
@@ -1,5 +1,11 @@ # ChangeLog for githash +## 0.1.6.0++* Always include patchlevel and hash in git-describe output++* Don't let user's configured initial branch name break tests+ ## 0.1.5.0 * Add git tag output via git-describe
githash.cabal view
@@ -1,13 +1,11 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0.+-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack------ hash: 76e20e5de8ee3f6ad531cde0a1529cbbde0158147f0560b23ab57c69d735ede2 name: githash-version: 0.1.5.0+version: 0.1.6.0 synopsis: Compile git revision info into Haskell projects description: Please see the README and documentation at <https://www.stackage.org/package/githash> category: Development
src/GitHash.hs view
@@ -218,7 +218,7 @@ _giCommitMessage <- run ["log", "-1", "--pretty=%B"] - _giDescribe <- run ["describe", "--always"]+ _giDescribe <- run ["describe", "--always", "--long"] _giTag <- run ["describe", "--always", "--tags"]
test/NormalRepoSpec.hs view
@@ -24,7 +24,7 @@ Left err -> expectationFailure $ show err Right gi -> do length (giHash gi) `shouldNotBe` 128- giBranch gi `shouldBe` "master"+ giBranch gi `shouldBe` initialBranchName giDirty gi `shouldBe` False giCommitDate gi `shouldNotBe` [] giCommitCount gi `shouldBe` 1@@ -40,7 +40,7 @@ createDirectoryIfMissing True fp let runGit args = void $ readCreateProcess ((proc "git" args) {cwd = Just fp}) ""- runGit ["init"]+ runGit ["init", "--initial-branch", initialBranchName] SB.writeFile (fp </> "README.md") "This is a readme, you should read it."@@ -55,3 +55,6 @@ , "Initial commit" ] runTest fp++initialBranchName :: String+initialBranchName = "main"
test/RepoWithASubmoduleSpec.hs view
@@ -26,7 +26,7 @@ Left err -> expectationFailure $ show err Right gi -> do length (giHash gi) `shouldNotBe` 128- giBranch gi `shouldBe` "master"+ giBranch gi `shouldBe` initialBranchName giDirty gi `shouldBe` False giCommitDate gi `shouldNotBe` [] giCommitCount gi `shouldBe` 1@@ -51,8 +51,8 @@ void $ readCreateProcess ((proc "git" args) {cwd = Just d}) "" runGit1 = runGitIn fp1 runGit2 = runGitIn fp2- runGit1 ["init"]- runGit2 ["init"]+ runGit1 ["init", "--initial-branch", initialBranchName]+ runGit2 ["init", "--initial-branch", initialBranchName] SB.writeFile (fp2 </> "README.md") "This is a readme, you should read it."@@ -77,3 +77,6 @@ , "Initial commit" ] runTest (fp1, fp2)++initialBranchName :: String+initialBranchName = "main"