diff --git a/ChangeLog.txt b/ChangeLog.txt index 4999d12339..5225a7fb0f 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,6 +10,11 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2013-03-16 04:51 UTC+0100 Viktor Szakats (harbour syenar.net) + * config/global.mk + ! fixed to not try to query git information and fail, + when run in a source snapshot + 2013-03-16 04:42 UTC+0100 Viktor Szakats (harbour syenar.net) * package/updt_web_nightly.sh + use curl instead of wget diff --git a/config/global.mk b/config/global.mk index 0296ebbb5e..d73e4e1db2 100644 --- a/config/global.mk +++ b/config/global.mk @@ -1742,13 +1742,15 @@ ifeq ($(HB_INIT_DONE),) # 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 ===) + ifneq ($(wildcard .git),) + ifneq ($(call find_in_path,git),) + _tmp := $(shell git diff --name-only --quiet) + ifneq ($(_tmp),) + $(info ! === WARNING: Locally modified source code ===) + endif + _tmp := $(shell git rev-parse --short HEAD) + $(info ! GIT-REVISION: $(_tmp)) endif - _tmp := $(shell git rev-parse --short HEAD) - $(info ! REVISION: $(_tmp)) endif endif endif