summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTuncer Ayaz <tuncer.ayaz@gmail.com>2012-09-21 17:20:03 +0200
committerTuncer Ayaz <tuncer.ayaz@gmail.com>2012-09-21 17:20:03 +0200
commit1b52a597c44209da3903e1477399ea35a6a9efc4 (patch)
tree2d351e7afdd9972461e4f50c35b404ee6747dbbe
parent3e3e639c89982f83b71cb7ec7f3cc55f8b1ee8a4 (diff)
Revert 15b7798e4 and restore old git-describe call
Restore previous 'git describe' behaviour as discussed here: http://lists.basho.com/pipermail/rebar_lists.basho.com/2012-September/001713.html
-rw-r--r--src/rebar_utils.erl12
1 files changed, 1 insertions, 11 deletions
diff --git a/src/rebar_utils.erl b/src/rebar_utils.erl
index 34db1df..42a152d 100644
--- a/src/rebar_utils.erl
+++ b/src/rebar_utils.erl
@@ -475,17 +475,7 @@ vcs_vsn_1(Vcs, Dir) ->
end
end.
-vcs_vsn_cmd(git) ->
- %% git describe the last commit that touched CWD
- %% required for correct versioning of apps in subdirs, such as apps/app1
- case os:type() of
- {win32,nt} ->
- "FOR /F \"usebackq tokens=* delims=\" %i in "
- "(`git log -n 1 \"--pretty=format:%h\" .`) do "
- "@git describe --always --tags %i";
- _ ->
- "git describe --always --tags `git log -n 1 --pretty=format:%h .`"
- end;
+vcs_vsn_cmd(git) -> "git describe --always --tags";
vcs_vsn_cmd(hg) -> "hg identify -i";
vcs_vsn_cmd(bzr) -> "bzr revno";
vcs_vsn_cmd(svn) -> "svnversion";