diff options
author | Junio C Hamano <junkio@cox.net> | 2006-12-27 02:43:46 -0800 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-12-27 02:43:46 -0800 |
commit | 37818d7db070f67a20df58ac7d5e04cc63ef1867 (patch) | |
tree | 1b1b2b71afab1c4ad29666f56fa8d2560b7855c6 /environment.c | |
parent | 4bcb310c2539b66d535e87508d1b7a90fe29c083 (diff) | |
parent | ae72f685418b79bbd67e1017c5b1ac7d731c042e (diff) | |
download | git-37818d7db070f67a20df58ac7d5e04cc63ef1867.tar.gz |
Merge branch 'master' into js/shallow
This is to adjust to:
count-objects -v: show number of packs as well.
which will break a test in this series.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'environment.c')
-rw-r--r-- | environment.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/environment.c b/environment.c index 84d870ca4e..f8c7dbcead 100644 --- a/environment.c +++ b/environment.c @@ -48,6 +48,16 @@ static void setup_git_env(void) git_graft_file = getenv(GRAFT_ENVIRONMENT); if (!git_graft_file) git_graft_file = xstrdup(git_path("info/grafts")); + log_all_ref_updates = !is_bare_git_dir(git_dir); +} + +int is_bare_git_dir (const char *dir) +{ + const char *s; + if (!strcmp(dir, DEFAULT_GIT_DIR_ENVIRONMENT)) + return 0; + s = strrchr(dir, '/'); + return !s || strcmp(s + 1, DEFAULT_GIT_DIR_ENVIRONMENT); } const char *get_git_dir(void) |