diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-12-05 11:24:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-05 11:24:28 -0800 |
| commit | cd1c2e7301820f9a198c8d665cd72d930233d02a (patch) | |
| tree | bae2ad03e1ca04c3168e2f4bc2db840b14bc043d /exec_cmd.c | |
| parent | 0a79ccaac7dcfaf93294979fd9608d0f95fd7a47 (diff) | |
| parent | 6854a8f5c9ecf32f5bd85020e77d48d3ffdf48fc (diff) | |
| download | git-cd1c2e7301820f9a198c8d665cd72d930233d02a.tar.gz | |
Merge branch 'jk/common-main' into maint-2.10
* jk/common-main:
common-main: stop munging argv[0] path
git-compat-util: move content inside ifdef/endif guards
Diffstat (limited to 'exec_cmd.c')
| -rw-r--r-- | exec_cmd.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/exec_cmd.c b/exec_cmd.c index 9d5703a157..19ac2146d0 100644 --- a/exec_cmd.c +++ b/exec_cmd.c @@ -38,21 +38,17 @@ char *system_path(const char *path) return strbuf_detach(&d, NULL); } -const char *git_extract_argv0_path(const char *argv0) +void git_extract_argv0_path(const char *argv0) { const char *slash; if (!argv0 || !*argv0) - return NULL; + return; slash = find_last_dir_sep(argv0); - if (slash) { + if (slash) argv0_path = xstrndup(argv0, slash - argv0); - return slash + 1; - } - - return argv0; } void git_set_argv_exec_path(const char *exec_path) |