diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-11-29 12:22:13 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-11-29 12:22:13 -0800 |
| commit | 95c2b13a5fc06db6556def93843653e948e71e4b (patch) | |
| tree | f6f1b90a0ce387460e3bb28a6f0399666f14a9b1 /exec_cmd.c | |
| parent | 061eeff104e74e50a6ddeed5b4a5fb382767742f (diff) | |
| parent | 6854a8f5c9ecf32f5bd85020e77d48d3ffdf48fc (diff) | |
| download | git-95c2b13a5fc06db6556def93843653e948e71e4b.tar.xz | |
Merge branch 'jk/common-main'
Fix for a small regression in a topic already in 'master'.
* jk/common-main:
common-main: stop munging argv[0] path
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) |