X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=environment.c;h=f4549d3f7b0367b31b0fa0042fb12ff183beb081;hb=c3f6163b0b6e2cfae1422050c9607db1130cded0;hp=c3efbb96084de04465f7eff45376cadc3ab2526b;hpb=61a6f1faecf19d7727bdfae012a14747c672cb1a;p=thirdparty%2Fgit.git

diff --git a/environment.c b/environment.c
index c3efbb9608..f4549d3f7b 100644
--- a/environment.c
+++ b/environment.c
@@ -15,6 +15,7 @@ int user_ident_explicitly_given;
 int trust_executable_bit = 1;
 int trust_ctime = 1;
 int has_symlinks = 1;
+int minimum_abbrev = 4, default_abbrev = 7;
 int ignore_case;
 int assume_unchanged;
 int prefer_symlink_refs;
@@ -139,7 +140,7 @@ static int git_work_tree_initialized;
 void set_git_work_tree(const char *new_work_tree)
 {
 	if (git_work_tree_initialized) {
-		new_work_tree = make_absolute_path(new_work_tree);
+		new_work_tree = real_path(new_work_tree);
 		if (strcmp(new_work_tree, work_tree))
 			die("internal error: work tree has already been set\n"
 			    "Current worktree: %s\nNew worktree: %s",
@@ -147,7 +148,7 @@ void set_git_work_tree(const char *new_work_tree)
 		return;
 	}
 	git_work_tree_initialized = 1;
-	work_tree = xstrdup(make_absolute_path(new_work_tree));
+	work_tree = xstrdup(real_path(new_work_tree));
 }
 
 const char *get_git_work_tree(void)