From 3d46ebae6dca438aca62225fdeb3a46f94476d8c Mon Sep 17 00:00:00 2001 From: Fernando Ontiveros Date: Fri, 1 Apr 2011 16:27:45 -0400 Subject: [PATCH] BUG 6649 reporting git branch and tag for developmente improving to show the number of commits after last tag. --- workflow/engine/methods/login/dbInfo.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/workflow/engine/methods/login/dbInfo.php b/workflow/engine/methods/login/dbInfo.php index 5e6a55805..896da8dc4 100644 --- a/workflow/engine/methods/login/dbInfo.php +++ b/workflow/engine/methods/login/dbInfo.php @@ -43,6 +43,11 @@ if (! defined ( 'PM_VERSION' )) { else { $cmd = sprintf ("cd %s && git status | grep 'On branch' | awk '{print $3 $4} ' && git log --decorate | grep '(tag:' | head -1 | awk '{print $3$4} ' ", PATH_TRUNK); if ( exec ( $cmd , $target) ) { + $cmd = sprintf ("cd %s && git log --decorate | grep '(tag:' | head -1 | awk '{print $2} ' ", PATH_TRUNK); + $commit = exec ( $cmd , $dummyTarget); + $cmd = sprintf ("echo ' +' && cd %s && git log %s.. --oneline | wc -l && echo ' commits.'", PATH_TRUNK, $commit ); + exec ( $cmd , $target) ; + //$target[] = "+ 343 commits"; define ( 'PM_VERSION', implode(' ', $target) ); } else