From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Sat, 3 Nov 2007 13:18:06 +0000 (+0700)
Subject: Add missing inside_work_tree setting in setup_git_directory_gently
X-Git-Tag: v1.5.4-rc0~37^2~4^2~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1e8a1954519a070e92cb73f756b271664e1cc4d1;p=git.git

Add missing inside_work_tree setting in setup_git_directory_gently

When both GIT_DIR and GIT_WORK_TREE are set, and
setup_git_directory_gently() changes the current working
directory accordingly, it should also set inside_work_tree = 1.

Without this, work_tree handling code in setup_git_directory()
will be activated. If you stay in root work tree (no prefix),
it does not harm. It does if you work from a subdirectory though.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/setup.c b/setup.c
index 145eca50f..6f8f76958 100644
--- a/setup.c
+++ b/setup.c
@@ -240,6 +240,7 @@ const char *setup_git_directory_gently(int *nongit_ok)
 			if (chdir(work_tree_env) < 0)
 				die ("Could not chdir to %s", work_tree_env);
 			strcat(buffer, "/");
+			inside_work_tree = 1;
 			return retval;
 		}
 		if (nongit_ok) {