Skip to content

Commit 5e095c4

Browse files
dschoGit for Windows Build Agent
dscho
authored and
Git for Windows Build Agent
committed
Merge pull request #2506 from dscho/issue-2283
Allow running Git directly from `C:\Program Files\Git\mingw64\bin\git.exe`
2 parents d1277ad + 8b477d9 commit 5e095c4

File tree

3 files changed

+131
-4
lines changed

3 files changed

+131
-4
lines changed

‎compat/mingw.c

Lines changed: 97 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2905,6 +2905,66 @@ int xwcstoutf(char *utf, const wchar_t *wcs, size_t utflen)
29052905
return -1;
29062906
}
29072907

2908+
#ifdef ENSURE_MSYSTEM_IS_SET
2909+
#if !defined(RUNTIME_PREFIX) || !defined(HAVE_WPGMPTR)
2910+
static size_t append_system_bin_dirs(char *path UNUSED, size_t size UNUSED)
2911+
{
2912+
return 0;
2913+
}
2914+
#else
2915+
static size_t append_system_bin_dirs(char *path, size_t size)
2916+
{
2917+
char prefix[32768];
2918+
const char *slash;
2919+
size_t len = xwcstoutf(prefix, _wpgmptr, sizeof(prefix)), off = 0;
2920+
2921+
if (len == 0 || len >= sizeof(prefix) ||
2922+
!(slash = find_last_dir_sep(prefix)))
2923+
return 0;
2924+
/* strip trailing `git.exe` */
2925+
len = slash - prefix;
2926+
2927+
/* strip trailing `cmd` or `mingw64\bin` or `mingw32\bin` or `bin` or `libexec\git-core` */
2928+
if (strip_suffix_mem(prefix, &len, "\\mingw64\\libexec\\git-core") ||
2929+
strip_suffix_mem(prefix, &len, "\\mingw64\\bin"))
2930+
off += xsnprintf(path + off, size - off,
2931+
"%.*s\\mingw64\\bin;", (int)len, prefix);
2932+
else if (strip_suffix_mem(prefix, &len, "\\clangarm64\\libexec\\git-core") ||
2933+
strip_suffix_mem(prefix, &len, "\\clangarm64\\bin"))
2934+
off += xsnprintf(path + off, size - off,
2935+
"%.*s\\clangarm64\\bin;", (int)len, prefix);
2936+
else if (strip_suffix_mem(prefix, &len, "\\mingw32\\libexec\\git-core") ||
2937+
strip_suffix_mem(prefix, &len, "\\mingw32\\bin"))
2938+
off += xsnprintf(path + off, size - off,
2939+
"%.*s\\mingw32\\bin;", (int)len, prefix);
2940+
else if (strip_suffix_mem(prefix, &len, "\\cmd") ||
2941+
strip_suffix_mem(prefix, &len, "\\bin") ||
2942+
strip_suffix_mem(prefix, &len, "\\libexec\\git-core"))
2943+
off += xsnprintf(path + off, size - off,
2944+
"%.*s\\mingw%d\\bin;", (int)len, prefix,
2945+
(int)(sizeof(void *) * 8));
2946+
else
2947+
return 0;
2948+
2949+
off += xsnprintf(path + off, size - off,
2950+
"%.*s\\usr\\bin;", (int)len, prefix);
2951+
return off;
2952+
}
2953+
#endif
2954+
#endif
2955+
2956+
static int is_system32_path(const char *path)
2957+
{
2958+
WCHAR system32[MAX_PATH], wpath[MAX_PATH];
2959+
2960+
if (xutftowcs_path(wpath, path) < 0 ||
2961+
!GetSystemDirectoryW(system32, ARRAY_SIZE(system32)) ||
2962+
_wcsicmp(system32, wpath))
2963+
return 0;
2964+
2965+
return 1;
2966+
}
2967+
29082968
static void setup_windows_environment(void)
29092969
{
29102970
char *tmp = getenv("TMPDIR");
@@ -2945,7 +3005,8 @@ static void setup_windows_environment(void)
29453005
strbuf_addstr(&buf, tmp);
29463006
if ((tmp = getenv("HOMEPATH"))) {
29473007
strbuf_addstr(&buf, tmp);
2948-
if (is_directory(buf.buf))
3008+
if (!is_system32_path(buf.buf) &&
3009+
is_directory(buf.buf))
29493010
setenv("HOME", buf.buf, 1);
29503011
else
29513012
tmp = NULL; /* use $USERPROFILE */
@@ -2956,6 +3017,41 @@ static void setup_windows_environment(void)
29563017
if (!tmp && (tmp = getenv("USERPROFILE")))
29573018
setenv("HOME", tmp, 1);
29583019
}
3020+
3021+
if (!getenv("PLINK_PROTOCOL"))
3022+
setenv("PLINK_PROTOCOL", "ssh", 0);
3023+
3024+
#ifdef ENSURE_MSYSTEM_IS_SET
3025+
if (!(tmp = getenv("MSYSTEM")) || !tmp[0]) {
3026+
const char *home = getenv("HOME"), *path = getenv("PATH");
3027+
char buf[32768];
3028+
size_t off = 0;
3029+
3030+
#if defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC)
3031+
setenv("MSYSTEM", "CLANGARM64", 1);
3032+
#elif defined(__MINGW64__) || defined(_M_AMD64)
3033+
setenv("MSYSTEM", "MINGW64", 1);
3034+
#else
3035+
setenv("MSYSTEM", "MINGW32", 1);
3036+
#endif
3037+
3038+
if (home)
3039+
off += xsnprintf(buf + off, sizeof(buf) - off,
3040+
"%s\\bin;", home);
3041+
off += append_system_bin_dirs(buf + off, sizeof(buf) - off);
3042+
if (path)
3043+
off += xsnprintf(buf + off, sizeof(buf) - off,
3044+
"%s", path);
3045+
else if (off > 0)
3046+
buf[off - 1] = '\0';
3047+
else
3048+
buf[0] = '\0';
3049+
setenv("PATH", buf, 1);
3050+
}
3051+
#endif
3052+
3053+
if (!getenv("LC_ALL") && !getenv("LC_CTYPE") && !getenv("LANG"))
3054+
setenv("LC_CTYPE", "C.UTF-8", 1);
29593055
}
29603056

29613057
static void get_current_user_sid(PSID *sid, HANDLE *linked_token)

‎config.mak.uname

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ endif
526526
compat/win32/pthread.o compat/win32/syslog.o \
527527
compat/win32/trace2_win32_process_info.o \
528528
compat/win32/dirent.o
529-
COMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DDETECT_MSYS_TTY -DNOGDI -DHAVE_STRING_H -Icompat -Icompat/regex -Icompat/win32 -DSTRIP_EXTENSION=\".exe\"
529+
COMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DDETECT_MSYS_TTY -DENSURE_MSYSTEM_IS_SET -DNOGDI -DHAVE_STRING_H -Icompat -Icompat/regex -Icompat/win32 -DSTRIP_EXTENSION=\".exe\"
530530
BASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -ENTRY:wmainCRTStartup -SUBSYSTEM:CONSOLE
531531
# invalidcontinue.obj allows Git's source code to close the same file
532532
# handle twice, or to access the osfhandle of an already-closed stdout
@@ -759,7 +759,7 @@ ifeq ($(uname_S),MINGW)
759759
endif
760760
CC = gcc
761761
COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO=0 -DDETECT_MSYS_TTY \
762-
-fstack-protector-strong
762+
-DENSURE_MSYSTEM_IS_SET -fstack-protector-strong
763763
EXTLIBS += -lntdll
764764
EXTRA_PROGRAMS += headless-git$X
765765
INSTALL = /bin/install

‎t/t0060-path-utils.sh

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,8 @@ test_expect_success !VALGRIND,RUNTIME_PREFIX,CAN_EXEC_IN_PWD 'RUNTIME_PREFIX wor
610610
echo "echo HERE" | write_script pretend/libexec/git-core/git-here &&
611611
GIT_EXEC_PATH= ./pretend/bin/git here >actual &&
612612
echo HERE >expect &&
613-
test_cmp expect actual'
613+
test_cmp expect actual
614+
'
614615

615616
test_expect_success !VALGRIND,RUNTIME_PREFIX,CAN_EXEC_IN_PWD '%(prefix)/ works' '
616617
git config yes.path "%(prefix)/yes" &&
@@ -619,4 +620,34 @@ test_expect_success !VALGRIND,RUNTIME_PREFIX,CAN_EXEC_IN_PWD '%(prefix)/ works'
619620
test_cmp expect actual
620621
'
621622

623+
test_expect_success MINGW,RUNTIME_PREFIX 'MSYSTEM/PATH is adjusted if necessary' '
624+
if test -z "$MINGW_PREFIX"
625+
then
626+
MINGW_PREFIX="/$(echo "${MSYSTEM:-MINGW64}" | tr A-Z a-z)"
627+
fi &&
628+
mkdir -p "$HOME"/bin pretend"$MINGW_PREFIX"/bin \
629+
pretend"$MINGW_PREFIX"/libexec/git-core pretend/usr/bin &&
630+
cp "$GIT_EXEC_PATH"/git.exe pretend"$MINGW_PREFIX"/bin/ &&
631+
cp "$GIT_EXEC_PATH"/git.exe pretend"$MINGW_PREFIX"/libexec/git-core/ &&
632+
# copy the .dll files, if any (happens when building via CMake)
633+
if test -n "$(ls "$GIT_EXEC_PATH"/*.dll 2>/dev/null)"
634+
then
635+
cp "$GIT_EXEC_PATH"/*.dll pretend"$MINGW_PREFIX"/bin/ &&
636+
cp "$GIT_EXEC_PATH"/*.dll pretend"$MINGW_PREFIX"/libexec/git-core/
637+
fi &&
638+
echo "env | grep MSYSTEM=" | write_script "$HOME"/bin/git-test-home &&
639+
echo "echo ${MINGW_PREFIX#/}" | write_script pretend"$MINGW_PREFIX"/bin/git-test-bin &&
640+
echo "echo usr" | write_script pretend/usr/bin/git-test-bin2 &&
641+
642+
(
643+
MSYSTEM= &&
644+
GIT_EXEC_PATH= &&
645+
pretend"$MINGW_PREFIX"/libexec/git-core/git.exe test-home >actual &&
646+
pretend"$MINGW_PREFIX"/libexec/git-core/git.exe test-bin >>actual &&
647+
pretend"$MINGW_PREFIX"/bin/git.exe test-bin2 >>actual
648+
) &&
649+
test_write_lines MSYSTEM=$MSYSTEM "${MINGW_PREFIX#/}" usr >expect &&
650+
test_cmp expect actual
651+
'
652+
622653
test_done

0 commit comments

Comments
 (0)