From 1b52a597c44209da3903e1477399ea35a6a9efc4 Mon Sep 17 00:00:00 2001 From: Tuncer Ayaz Date: Fri, 21 Sep 2012 17:20:03 +0200 Subject: [PATCH] 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 --- src/rebar_utils.erl | 12 +----------- 1 file changed, 1 insertion(+), 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";