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

Work around sed output difference that led to version containing a newline on OSX.

Browse source
This commit is contained in:
Joey Hess 2013-10-16 10:28:13 -04:00
parent 89345b7108
commit ecb4a30548
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Build/Version.hs
View file

@ -32,7 +32,7 @@ getVersion = do
( return changelogversion ( return changelogversion
, catchDefaultIO changelogversion $ do , catchDefaultIO changelogversion $ do
let major = takeWhile (/= '.') changelogversion let major = takeWhile (/= '.') changelogversion
autoversion <- readProcess "sh" autoversion <- takeWhile isAlphaNum <$> readProcess "sh"
[ "-c" [ "-c"
, "git log -n 1 --format=format:'%ci %h'| sed -e 's/-//g' -e 's/ .* /-g/'" , "git log -n 1 --format=format:'%ci %h'| sed -e 's/-//g' -e 's/ .* /-g/'"
] "" ] ""

2
debian/changelog vendored
View file

@ -21,6 +21,8 @@ git-annex (4.20131003) UNRELEASED; urgency=low
* status: Fix a crash if a temp file went away while its size was * status: Fix a crash if a temp file went away while its size was
being checked for status. being checked for status.
* Deal with git check-attr -z output format change in git 1.8.5. * Deal with git check-attr -z output format change in git 1.8.5.
* Work around sed output difference that led to version containing a newline
on OSX.
-- Joey Hess <joeyh@debian.org> Thu, 03 Oct 2013 15:41:24 -0400 -- Joey Hess <joeyh@debian.org> Thu, 03 Oct 2013 15:41:24 -0400