From 1fe090768fc971ee0b6180b18f00d103c8502b9d Mon Sep 17 00:00:00 2001 From: vszakats Date: Fri, 15 Mar 2013 02:48:59 +0100 Subject: [PATCH] 2013-03-15 02:46 UTC+0100 Viktor Szakats (harbour syenar.net) * config/global.mk + enabled git revision detection instead of svn + added detection for locally modified source code with git * bin/commit.hb + process 'T' git change status --- harbour/ChangeLog.txt | 8 ++++++++ harbour/bin/commit.hb | 1 + harbour/config/global.mk | 22 +++++++++++++--------- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/harbour/ChangeLog.txt b/harbour/ChangeLog.txt index 4704838643..b9dbb79463 100644 --- a/harbour/ChangeLog.txt +++ b/harbour/ChangeLog.txt @@ -10,6 +10,14 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2013-03-15 02:46 UTC+0100 Viktor Szakats (harbour syenar.net) + * config/global.mk + + enabled git revision detection instead of svn + + added detection for locally modified source code with git + + * bin/commit.hb + + process 'T' git change status + 2013-03-14 18:36 UTC+0100 Viktor Szakats (harbour syenar.net) * utils/hbmk2/hbmk2.prg ! fixed to not issue warning about missing sign tool diff --git a/harbour/bin/commit.hb b/harbour/bin/commit.hb index a983ac4dc2..55b6f9c635 100644 --- a/harbour/bin/commit.hb +++ b/harbour/bin/commit.hb @@ -169,6 +169,7 @@ STATIC FUNCTION DoctorChanges( cVCS, aChanges ) EXIT CASE "M" CASE "R" + CASE "T" CASE "U" cStart := "*" EXIT diff --git a/harbour/config/global.mk b/harbour/config/global.mk index 69126e014c..ee0b478f32 100644 --- a/harbour/config/global.mk +++ b/harbour/config/global.mk @@ -1739,17 +1739,21 @@ ifeq ($(HB_INIT_DONE),) $(info ! HB_INSTALL_PREFIX automatically set to: $(HB_INSTALL_PREFIX)) endif ifeq ($(ROOT),./) - ifneq ($(call find_in_path,svnversion),) - _tmp := $(shell svnversion .) - ifneq ($(findstring M,$(_tmp)),) - $(info ! === WARNING: Locally modified source code ===) - endif - $(info ! REVISION: $(_tmp)) - endif -# ifneq ($(call find_in_path,git),) -# _tmp := $(shell git rev-parse --short HEAD) +# ifneq ($(call find_in_path,svnversion),) +# _tmp := $(shell svnversion .) +# ifneq ($(findstring M,$(_tmp)),) +# $(info ! === WARNING: Locally modified source code ===) +# endif # $(info ! REVISION: $(_tmp)) # endif + ifneq ($(call find_in_path,git),) + _tmp := $(shell git diff --name-only) + ifneq ($(_tmp),) + $(info ! === WARNING: Locally modified source code ===) + endif + _tmp := $(shell git rev-parse --short HEAD) + $(info ! REVISION: $(_tmp)) + endif endif endif