mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

don't use changelog version in commit message

Browse source 
changelog may have a new unreleased version open already
This commit is contained in:
Joey Hess 2021-08-09 12:31:48 -04:00
parent c9b1b7d067
commit 5990942b6c
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Build/DistributionUpdate.hs
View file

@ -117,14 +117,14 @@ getbuild repodir (url, f) = do
versionchar c = isAlphaNum c || c == '.' || c == '-' versionchar c = isAlphaNum c || c == '.' || c == '-'
makeinfos :: [(FilePath, Version)] -> Version -> Annex [([Char], Maybe GitAnnexDistribution)] makeinfos :: [(FilePath, Version)] -> Version -> Annex [([Char], Maybe GitAnnexDistribution)]
makeinfos updated version = do makeinfos updated changelogversion = do
mapM_ (\f -> inRepo $ runBool [Param "annex", Param "add", File f]) (map fst updated) mapM_ (\f -> inRepo $ runBool [Param "annex", Param "add", File f]) (map fst updated)
void $ inRepo $ runBool void $ inRepo $ runBool
[ Param "commit" [ Param "commit"
, Param "-a" , Param "-a"
, Param ("-S" ++ signingKey) , Param ("-S" ++ signingKey)
, Param "-m" , Param "-m"
, Param $ "publishing git-annex " ++ version , Param $ "publishing git-annex " ++ descversion
] ]
now <- liftIO getCurrentTime now <- liftIO getCurrentTime
liftIO $ putStrLn $ "building info files" liftIO $ putStrLn $ "building info files"
@ -150,7 +150,7 @@ makeinfos updated version = do
[ Param "commit" [ Param "commit"
, Param ("-S" ++ signingKey) , Param ("-S" ++ signingKey)
, Param "-m" , Param "-m"
, Param $ "updated info files for git-annex " ++ version , Param $ "updated info files for git-annex " ++ descversion
] ]
void $ inRepo $ runBool void $ inRepo $ runBool
[ Param "annex" [ Param "annex"
@ -174,7 +174,8 @@ makeinfos updated version = do
where where
outofdate (_, md) = case md of outofdate (_, md) = case md of
Nothing -> True Nothing -> True
Just d -> distributionVersion d /= version Just d -> distributionVersion d /= changelogversion
descversion = unwords (nub (map snd updated))
getRepoDir :: IO FilePath getRepoDir :: IO FilePath
getRepoDir = do getRepoDir = do

10
doc/bugs/downloads.kitenet.net_do_not_correspond_in_version/comment_2_1ccfafa13e1807f099b22bb69d23497c._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="joey"
subject="""comment 2"""
date="2021-08-09T16:23:35Z"
content="""
As far as the git commit message goes, I usually don't have a new changelog
entry for an unreleased version opened when I run the release updating
script, but did in this case. Only the commit message is affected. I've
fixed the cause of that problem.
"""]]