development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-25 02:35:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jk/common-main'

Browse source 
Fix for a small regression in a topic already in 'master'.

* jk/common-main:
  common-main: stop munging argv[0] path
This commit is contained in:
Junio C Hamano 2016-11-29 12:22:13 -08:00
parent 061eeff104 6854a8f5c9
commit 95c2b13a5f
4 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common-main.c
View file

@ -33,7 +33,7 @@ int main(int argc, const char **argv)
git_setup_gettext();
argv[0] = git_extract_argv0_path(argv[0]);
git_extract_argv0_path(argv[0]);
restore_sigpipe_to_default();

10
exec_cmd.c
View file

@ -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)

2
exec_cmd.h
View file

@ -4,7 +4,7 @@
struct argv_array;
extern void git_set_argv_exec_path(const char *exec_path);
extern const char *git_extract_argv0_path(const char *path);
extern void git_extract_argv0_path(const char *path);
extern const char *git_exec_path(void);
extern void setup_path(void);
extern const char **prepare_git_cmd(struct argv_array *out, const char **argv);

5
git.c
View file

@ -654,6 +654,11 @@ int cmd_main(int argc, const char **argv)
cmd = argv[0];
if (!cmd)
cmd = "git-help";
else {
const char *slash = find_last_dir_sep(cmd);
if (slash)
cmd = slash + 1;
}
trace_command_performance(argv);