Skip to content

Commit

Permalink
Merge branch 'mingw-expand-absolute-user-path'
Browse files Browse the repository at this point in the history
When compiling Git with a runtime prefix (so that it can be installed
into any location, finding its libexec/ directory relative to the
location of the `git` executable), it is convenient to provide
"absolute" Unix-y paths e.g. for http.sslCAInfo, and have those absolute
paths be resolved relative to the runtime prefix.

This patch makes it so for Windows. It is up for discussion whether we
want this for other platforms, too, as long as building with
RUNTIME_PREFIX.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
  • Loading branch information
dscho authored and Git for Windows Build Agent committed Feb 11, 2020
2 parents 618812f + ad59814 commit 128b13d
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions path.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include "packfile.h"
#include "object-store.h"
#include "lockfile.h"
#include "exec-cmd.h"

static int get_st_mode_bits(const char *path, int *mode)
{
Expand Down Expand Up @@ -732,6 +733,10 @@ char *expand_user_path(const char *path, int real_home)

if (path == NULL)
goto return_null;
#ifdef __MINGW32__
if (path[0] == '/')
return system_path(path + 1);
#endif
if (path[0] == '~') {
const char *first_slash = strchrnul(path, '/');
const char *username = path + 1;
Expand Down

0 comments on commit 128b13d

Please sign in to comment.