aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>2019-06-04 15:46:38 +0000
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>2019-06-04 15:46:38 +0000
commit5188add534a1532ef323a0fec3503f8e96dfe762 (patch)
tree8b5a4063bd71ad4cb62917fb8904bf62ff83accb
parentab4915edcbf25009ea29cba6bd4fe6758642a40e (diff)
parentb5e3b1e58ad9f4d8237821572e4d149eea881ff2 (diff)
downloadpleroma-5188add534a1532ef323a0fec3503f8e96dfe762.tar.gz
Merge branch 'remove-tag-warning' into 'develop'
Mix: Swallow git error messages during version number handling. See merge request pleroma/pleroma!1247
-rw-r--r--mix.exs3
1 files changed, 2 insertions, 1 deletions
diff --git a/mix.exs b/mix.exs
index df1a7ced4..9447a2e4f 100644
--- 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),