Merge branch 'jc/maint-apply-fix'

diff --git a/git.c b/git.c
index ecc8fad09aebd16410f2736458d60e04f9dfb296..320cb435646361b9d542d22d1592f985008fb750 100644 (file)
--- a/git.c
+++ b/git.c
@@ -442,21 +442,11 @@ static int run_argv(int *argcp, const char ***argv)
 
 int main(int argc, const char **argv)
 {
-       const char *cmd = argv[0] && *argv[0] ? argv[0] : "git-help";
-       char *slash = (char *)cmd + strlen(cmd);
+       const char *cmd;
 
-       /*
-        * Take the basename of argv[0] as the command
-        * name, and the dirname as the default exec_path
-        * if we don't have anything better.
-        */
-       while (cmd <= slash && !is_dir_sep(*slash))
-               slash--;
-       if (cmd <= slash) {
-               *slash++ = 0;
-               git_set_argv0_path(cmd);
-               cmd = slash;
-       }
+       cmd = git_extract_argv0_path(argv[0]);
+       if (!cmd)
+               cmd = "git-help";
 
        /*
         * "git-xxxx" is the same as "git xxxx", but we obviously: