Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-githash for openSUSE:Factory checked in at 2021-06-16 20:35:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-githash (Old) and /work/SRC/openSUSE:Factory/.ghc-githash.new.32437 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-githash" Wed Jun 16 20:35:06 2021 rev:5 rq:900340 version:0.1.6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-githash/ghc-githash.changes 2020-12-22 11:39:59.745532707 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-githash.new.32437/ghc-githash.changes 2021-06-16 20:36:56.671335565 +0200 @@ -1,0 +2,10 @@ +Wed Jun 9 07:33:55 UTC 2021 - [email protected] + +- Update githash to version 0.1.6.0. + ## 0.1.6.0 + + * Always include patchlevel and hash in git-describe output + + * Don't let user's configured initial branch name break tests + +------------------------------------------------------------------- Old: ---- githash-0.1.5.0.tar.gz New: ---- githash-0.1.6.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-githash.spec ++++++ --- /var/tmp/diff_new_pack.x8DaD3/_old 2021-06-16 20:36:57.011336144 +0200 +++ /var/tmp/diff_new_pack.x8DaD3/_new 2021-06-16 20:36:57.011336144 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-githash # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %global pkg_name githash %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.1.5.0 +Version: 0.1.6.0 Release: 0 Summary: Compile git revision info into Haskell projects License: BSD-3-Clause ++++++ githash-0.1.5.0.tar.gz -> githash-0.1.6.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/githash-0.1.5.0/ChangeLog.md new/githash-0.1.6.0/ChangeLog.md --- old/githash-0.1.5.0/ChangeLog.md 2020-10-26 13:48:16.000000000 +0100 +++ new/githash-0.1.6.0/ChangeLog.md 2021-06-08 13:28:30.000000000 +0200 @@ -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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/githash-0.1.5.0/githash.cabal new/githash-0.1.6.0/githash.cabal --- old/githash-0.1.5.0/githash.cabal 2020-10-26 13:48:24.000000000 +0100 +++ new/githash-0.1.6.0/githash.cabal 2021-06-08 13:28:45.000000000 +0200 @@ -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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/githash-0.1.5.0/src/GitHash.hs new/githash-0.1.6.0/src/GitHash.hs --- old/githash-0.1.5.0/src/GitHash.hs 2020-10-26 13:48:16.000000000 +0100 +++ new/githash-0.1.6.0/src/GitHash.hs 2021-06-08 13:28:30.000000000 +0200 @@ -218,7 +218,7 @@ _giCommitMessage <- run ["log", "-1", "--pretty=%B"] - _giDescribe <- run ["describe", "--always"] + _giDescribe <- run ["describe", "--always", "--long"] _giTag <- run ["describe", "--always", "--tags"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/githash-0.1.5.0/test/NormalRepoSpec.hs new/githash-0.1.6.0/test/NormalRepoSpec.hs --- old/githash-0.1.5.0/test/NormalRepoSpec.hs 2020-10-26 13:48:16.000000000 +0100 +++ new/githash-0.1.6.0/test/NormalRepoSpec.hs 2021-06-08 13:28:30.000000000 +0200 @@ -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" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/githash-0.1.5.0/test/RepoWithASubmoduleSpec.hs new/githash-0.1.6.0/test/RepoWithASubmoduleSpec.hs --- old/githash-0.1.5.0/test/RepoWithASubmoduleSpec.hs 2020-10-26 13:48:16.000000000 +0100 +++ new/githash-0.1.6.0/test/RepoWithASubmoduleSpec.hs 2021-06-08 13:28:30.000000000 +0200 @@ -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"
