diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-01-18 15:12:11 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-01-18 15:12:11 -0800 |
commit | 55d128ae06b7b82f867961b677984620612a201c (patch) | |
tree | 5628d92c5a897c1738ae99b360d303a2ac62409e /environment.c | |
parent | ffac48d093d4b518a0cc0e8bf1b7cb53e0c3d7a2 (diff) | |
parent | e6fac7f3d3e313a93fe9b1243917669267b33153 (diff) | |
download | git-55d128ae06b7b82f867961b677984620612a201c.tar.gz |
Merge branch 'bw/grep-recurse-submodules'
"git grep" has been taught to optionally recurse into submodules.
* bw/grep-recurse-submodules:
grep: search history of moved submodules
grep: enable recurse-submodules to work on <tree> objects
grep: optionally recurse into submodules
grep: add submodules as a grep source type
submodules: load gitmodules file from commit sha1
submodules: add helper to determine if a submodule is initialized
submodules: add helper to determine if a submodule is populated
real_path: canonicalize directory separators in root parts
real_path: have callers use real_pathdup and strbuf_realpath
real_path: create real_pathdup
real_path: convert real_path_internal to strbuf_realpath
real_path: resolve symlinks by hand
Diffstat (limited to 'environment.c')
-rw-r--r-- | environment.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/environment.c b/environment.c index 4bce3eebfa..8a83101d04 100644 --- a/environment.c +++ b/environment.c @@ -259,7 +259,7 @@ void set_git_work_tree(const char *new_work_tree) return; } git_work_tree_initialized = 1; - work_tree = xstrdup(real_path(new_work_tree)); + work_tree = real_pathdup(new_work_tree); } const char *get_git_work_tree(void) |