From b907b2e9bfecc3cdba5096d0a76c47eecc83dede Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Sat, 19 Sep 2015 17:10:00 -0500
Subject: update erlware_commons, remove unneeded 'v' prefix hack and back to
 'git' vsn

---
 rebar.config       | 2 +-
 rebar.lock         | 2 +-
 src/relx.app.src   | 2 +-
 src/rlx_config.erl | 7 ++++---
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/rebar.config b/rebar.config
index fce0a53..751579f 100644
--- a/rebar.config
+++ b/rebar.config
@@ -1,6 +1,6 @@
 %% -*- mode: Erlang; fill-column: 80; comment-column: 75; -*-
 %% Dependencies ================================================================
-{deps, [{erlware_commons, "0.15.0"},
+{deps, [{erlware_commons, "0.16.0"},
         {providers, "1.4.1"},
         {getopt, "0.8.2"},
         {bbmustache, "1.0.3"}
diff --git a/rebar.lock b/rebar.lock
index a5f7155..436477e 100644
--- a/rebar.lock
+++ b/rebar.lock
@@ -1,4 +1,4 @@
 [{<<"bbmustache">>,{pkg,<<"bbmustache">>,<<"1.0.3">>},0},
- {<<"erlware_commons">>,{pkg,<<"erlware_commons">>,<<"0.15.0">>},0},
+ {<<"erlware_commons">>,{pkg,<<"erlware_commons">>,<<"0.16.0">>},0},
  {<<"getopt">>,{pkg,<<"getopt">>,<<"0.8.2">>},0},
  {<<"providers">>,{pkg,<<"providers">>,<<"1.4.1">>},0}].
diff --git a/src/relx.app.src b/src/relx.app.src
index 639167a..8329eb9 100644
--- a/src/relx.app.src
+++ b/src/relx.app.src
@@ -1,6 +1,6 @@
 {application,relx,
              [{description,"Release assembler for Erlang/OTP Releases"},
-              {vsn,"3.5.0"},
+              {vsn,"git"},
               {modules,[]},
               {registered,[]},
               {applications,[kernel,stdlib,getopt,erlware_commons,bbmustache,
diff --git a/src/rlx_config.erl b/src/rlx_config.erl
index 0ee3543..b2de094 100644
--- a/src/rlx_config.erl
+++ b/src/rlx_config.erl
@@ -295,9 +295,10 @@ merge_configs([{Key, Value} | CliTerms], ConfigTerms) ->
     end.
 
 parse_vsn(Vsn) when Vsn =:= semver ; Vsn =:= "semver" ->
-    parse_vsn({semver, "v"});
-parse_vsn({semver, Prefix}) ->
-    {ok, V} = ec_git_vsn:vsn({Prefix}),
+    {ok, V} = ec_git_vsn:vsn([]),
+    V;
+parse_vsn({semver, _}) ->
+    {ok, V} = ec_git_vsn:vsn([]),
     V;
 parse_vsn({cmd, Command}) ->
     V = os:cmd(Command),
-- 
cgit v1.2.3