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 /transport.c | |
parent | Merge git://ozlabs.org/~paulus/gitk (diff) | |
parent | grep: search history of moved submodules (diff) | |
download | tgif-55d128ae06b7b82f867961b677984620612a201c.tar.xz |
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 'transport.c')
-rw-r--r-- | transport.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/transport.c b/transport.c index 3e8799a611..c86ba2eb89 100644 --- a/transport.c +++ b/transport.c @@ -1214,7 +1214,7 @@ static int refs_from_alternate_cb(struct alternate_object_database *e, const struct ref *extra; struct alternate_refs_data *cb = data; - other = xstrdup(real_path(e->path)); + other = real_pathdup(e->path); len = strlen(other); while (other[len-1] == '/') |