diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-02-02 21:36:55 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-02-02 21:36:55 (GMT) |
| commit | 6f1c08bdb75b37ad30103f0f12339780fdc004e2 (patch) | |
| tree | 3a6909ffaaa512519c3f6f6e7a11f0956276bcd1 /builtin | |
| parent | d008809bb5d1f9a669ee89b77b3a4b6bb7905009 (diff) | |
| parent | 0aaad415bcbdd7ccdfbb27eafb2f5926540455fa (diff) | |
| download | git-6f1c08bdb75b37ad30103f0f12339780fdc004e2.zip git-6f1c08bdb75b37ad30103f0f12339780fdc004e2.tar.gz git-6f1c08bdb75b37ad30103f0f12339780fdc004e2.tar.bz2 | |
Merge branch 'rs/absolute-pathdup'
Code cleanup.
* rs/absolute-pathdup:
use absolute_pathdup()
abspath: add absolute_pathdup()
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/clone.c | 4 | ||||
| -rw-r--r-- | builtin/submodule--helper.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/builtin/clone.c b/builtin/clone.c index 5ef8192..3f63edb 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -170,7 +170,7 @@ static char *get_repo_path(const char *repo, int *is_bundle) strbuf_addstr(&path, repo); raw = get_repo_path_1(&path, is_bundle); - canon = raw ? xstrdup(absolute_path(raw)) : NULL; + canon = raw ? absolute_pathdup(raw) : NULL; strbuf_release(&path); return canon; } @@ -894,7 +894,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix) path = get_repo_path(repo_name, &is_bundle); if (path) - repo = xstrdup(absolute_path(repo_name)); + repo = absolute_pathdup(repo_name); else if (!strchr(repo_name, ':')) die(_("repository '%s' does not exist"), repo_name); else diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index 74614a9..899dc33 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -626,7 +626,7 @@ static int module_clone(int argc, const char **argv, const char *prefix) module_clone_options); strbuf_addf(&sb, "%s/modules/%s", get_git_dir(), name); - sm_gitdir = xstrdup(absolute_path(sb.buf)); + sm_gitdir = absolute_pathdup(sb.buf); strbuf_reset(&sb); if (!is_absolute_path(path)) { |