logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 5188add534a1532ef323a0fec3503f8e96dfe762
parent: ab4915edcbf25009ea29cba6bd4fe6758642a40e
Author: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date:   Tue,  4 Jun 2019 15:46:38 +0000

Merge branch 'remove-tag-warning' into 'develop'

Mix: Swallow git error messages during version number handling.

See merge request pleroma/pleroma!1247

Diffstat:

Mmix.exs3++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mix.exs b/mix.exs @@ -157,7 +157,8 @@ defmodule Pleroma.Mixfile do # * the mix environment if different than prod defp version(version) do {git_tag, git_pre_release} = - with {tag, 0} <- System.cmd("git", ["describe", "--tags", "--abbrev=0"]), + with {tag, 0} <- + System.cmd("git", ["describe", "--tags", "--abbrev=0"], stderr_to_stdout: true), tag = String.trim(tag), {describe, 0} <- System.cmd("git", ["describe", "--tags", "--abbrev=8"]), describe = String.trim(describe),