Merge branch 'sn/static'

* sn/static:
  config.c: make git_env_bool() static
  environment.c: remove unused function

diff --cc cache.h
Simple merge