Per request/suggestion by Linus. This took far more effort to keep the existing tests working than the actual change. Junio C Hamano (4): config: allow customizing /etc/gitconfig location t13xx: do not assume system config is empty worktree: honor configuration variables core.abbrev: raise the default abbreviation to 12 hexdigits builtin/worktree.c | 2 ++ cache.h | 1 + config.c | 2 ++ environment.c | 2 +- t/gitconfig-for-test | 9 +++++++++ t/t1300-repo-config.sh | 39 ++++++++++++++++++++++++++++----------- t/t1308-config-set.sh | 1 + t/test-lib.sh | 4 ++-- 8 files changed, 46 insertions(+), 14 deletions(-) create mode 100644 t/gitconfig-for-test -- 2.10.0-584-gc9e068c