branch: fix branch renaming not updating HEADs correctly

diff --git a/environment.c b/environment.c
index c07fb17fb70bdb3cdf3ae9ab23196af9a0b7ad1b..2986ee7200891a00f1ca2a0bd153157450531bd5 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -214,6 +214,8 @@ const char *get_git_dir(void)
 
 const char *get_git_common_dir(void)
 {
+       if (!git_dir)
+               setup_git_env();
        return git_common_dir;
 }
 
@@ -259,7 +261,7 @@ void set_git_work_tree(const char *new_work_tree)
                return;
        }
        git_work_tree_initialized = 1;
-       work_tree = real_pathdup(new_work_tree);
+       work_tree = real_pathdup(new_work_tree, 1);
 }
 
 const char *get_git_work_tree(void)