Skip to content

Commit 8d74ef6

Browse files
dschodscho
committed
Merge branch 'busybox-w32'
This topic branch brings slightly experimental changes supporting Git for Windows to use BusyBox-w32 to execute its shell scripts as well as its test suite. The test suite can be run by installing the test artifacts into a MinGit that has busybox.exe (and using Git for Windows' SDK's Perl for now, as the test suite requires Perl even when NO_PERL is set, go figure) by using the `install-mingit-test-artifacts` Makefile target with the DESTDIR variable pointing to the top-level directory of the MinGit installation. To facilitate running the test suite (without having `make` available, as `make.exe` is not part of MinGit), this branch brings an experimental patch to the `test-run-command` helper to run Git's test suite. It is still very experimental, though: in this developer's tests it seemed that the `poll()` emulation required for `run_parallel_processes()` to work sometimes hiccups on Windows, causing infinite "hangs". It is also possible that BusyBox itself has problems writing to the pipes opened by `test-run-command` (and merging this branch will help investigate further). Caveat emptor. Signed-off-by: Johannes Schindelin <[email protected]>
2 parents 608a313 + ed4d0cd commit 8d74ef6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+687
-234
lines changed

‎Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -645,6 +645,7 @@ TEST_PROGRAMS_NEED_X += test-dump-untracked-cache
645645
TEST_PROGRAMS_NEED_X += test-fake-ssh
646646
TEST_PROGRAMS_NEED_X += test-genrandom
647647
TEST_PROGRAMS_NEED_X += test-hashmap
648+
TEST_PROGRAMS_NEED_X += test-helper
648649
TEST_PROGRAMS_NEED_X += test-index-version
649650
TEST_PROGRAMS_NEED_X += test-lazy-init-name-hash
650651
TEST_PROGRAMS_NEED_X += test-line-buffer

‎builtin/submodule--helper.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -930,7 +930,7 @@ static int update_clone_task_finished(int result,
930930
const struct cache_entry *ce;
931931
struct submodule_update_clone *suc = suc_cb;
932932

933-
int *idxP = *(int**)idx_task_cb;
933+
int *idxP = idx_task_cb;
934934
int idx = *idxP;
935935
free(idxP);
936936

‎compat/mingw.c

Lines changed: 103 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include "../cache.h"
99
#include "win32/exit-process.h"
1010
#include "../config.h"
11+
#include "../string-list.h"
1112

1213
#define HCAST(type, handle) ((type)(intptr_t)handle)
1314

@@ -1126,7 +1127,7 @@ static const char *quote_arg_msvc(const char *arg)
11261127

11271128
#include "quote.h"
11281129

1129-
static const char *quote_arg_sh(const char *arg)
1130+
static const char *quote_arg_msys2(const char *arg)
11301131
{
11311132
struct strbuf buf = STRBUF_INIT;
11321133
const char *p2 = arg, *p;
@@ -1216,6 +1217,65 @@ static char *lookup_prog(const char *dir, int dirlen, const char *cmd,
12161217
return NULL;
12171218
}
12181219

1220+
static char *path_lookup(const char *cmd, int exe_only);
1221+
1222+
static char *is_busybox_applet(const char *cmd)
1223+
{
1224+
static struct string_list applets = STRING_LIST_INIT_DUP;
1225+
static char *busybox_path;
1226+
static int busybox_path_initialized;
1227+
1228+
/* Avoid infinite loop */
1229+
if (!strncasecmp(cmd, "busybox", 7) &&
1230+
(!cmd[7] || !strcasecmp(cmd + 7, ".exe")))
1231+
return NULL;
1232+
1233+
if (!busybox_path_initialized) {
1234+
busybox_path = path_lookup("busybox.exe", 1);
1235+
busybox_path_initialized = 1;
1236+
}
1237+
1238+
/* Assume that sh is compiled in... */
1239+
if (!busybox_path || !strcasecmp(cmd, "sh"))
1240+
return xstrdup_or_null(busybox_path);
1241+
1242+
if (!applets.nr) {
1243+
struct child_process cp = CHILD_PROCESS_INIT;
1244+
struct strbuf buf = STRBUF_INIT;
1245+
char *p;
1246+
1247+
argv_array_pushl(&cp.args, busybox_path, "--help", NULL);
1248+
1249+
if (capture_command(&cp, &buf, 2048)) {
1250+
string_list_append(&applets, "");
1251+
return NULL;
1252+
}
1253+
1254+
/* parse output */
1255+
p = strstr(buf.buf, "Currently defined functions:\n");
1256+
if (!p) {
1257+
warning("Could not parse output of busybox --help");
1258+
string_list_append(&applets, "");
1259+
return NULL;
1260+
}
1261+
p = strchrnul(p, '\n');
1262+
for (;;) {
1263+
size_t len;
1264+
1265+
p += strspn(p, "\n\t ,");
1266+
len = strcspn(p, "\n\t ,");
1267+
if (!len)
1268+
break;
1269+
p[len] = '\0';
1270+
string_list_insert(&applets, p);
1271+
p = p + len + 1;
1272+
}
1273+
}
1274+
1275+
return string_list_has_string(&applets, cmd) ?
1276+
xstrdup(busybox_path) : NULL;
1277+
}
1278+
12191279
/*
12201280
* Determines the absolute path of cmd using the split path in path.
12211281
* If cmd contains a slash or backslash, no lookup is performed.
@@ -1244,6 +1304,9 @@ static char *path_lookup(const char *cmd, int exe_only)
12441304
path = sep + 1;
12451305
}
12461306

1307+
if (!prog && !isexe)
1308+
prog = is_busybox_applet(cmd);
1309+
12471310
return prog;
12481311
}
12491312

@@ -1528,9 +1591,37 @@ static void kill_child_processes_on_signal(void)
15281591
LeaveCriticalSection(&pinfo_cs);
15291592
}
15301593

1594+
static int is_msys2_sh(const char *cmd)
1595+
{
1596+
if (cmd && !strcmp(cmd, "sh")) {
1597+
static int ret = -1;
1598+
char *p;
1599+
1600+
if (ret >= 0)
1601+
return ret;
1602+
1603+
p = path_lookup(cmd, 0);
1604+
if (!p)
1605+
ret = 0;
1606+
else {
1607+
size_t len = strlen(p);
1608+
ret = len > 15 &&
1609+
is_dir_sep(p[len - 15]) &&
1610+
!strncasecmp(p + len - 14, "usr", 3) &&
1611+
is_dir_sep(p[len - 11]) &&
1612+
!strncasecmp(p + len - 10, "bin", 3) &&
1613+
is_dir_sep(p[len - 7]) &&
1614+
!strcasecmp(p + len - 6, "sh.exe");
1615+
free(p);
1616+
}
1617+
return ret;
1618+
}
1619+
return 0;
1620+
}
1621+
15311622
static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **deltaenv,
1532-
const char *dir,
1533-
int prepend_cmd, int fhin, int fhout, int fherr)
1623+
const char *dir, const char *prepend_cmd,
1624+
int fhin, int fhout, int fherr)
15341625
{
15351626
static int atexit_handler_initialized;
15361627
STARTUPINFOW si;
@@ -1542,7 +1633,7 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **deltaen
15421633
HANDLE cons;
15431634
const char *strace_env;
15441635
const char *(*quote_arg)(const char *arg) =
1545-
*argv && !strcmp("sh", *argv) ? quote_arg_sh : quote_arg_msvc;
1636+
is_msys2_sh(*argv) ? quote_arg_msys2 : quote_arg_msvc;
15461637

15471638
if (!atexit_handler_initialized) {
15481639
atexit_handler_initialized = 1;
@@ -1599,9 +1690,9 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **deltaen
15991690
/* concatenate argv, quoting args as we go */
16001691
strbuf_init(&args, 0);
16011692
if (prepend_cmd) {
1602-
char *quoted = (char *)quote_arg(cmd);
1693+
char *quoted = (char *)quote_arg(prepend_cmd);
16031694
strbuf_addstr(&args, quoted);
1604-
if (quoted != cmd)
1695+
if (quoted != prepend_cmd)
16051696
free(quoted);
16061697
}
16071698
for (; *argv; argv++) {
@@ -1678,7 +1769,8 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **deltaen
16781769
return (pid_t)pi.dwProcessId;
16791770
}
16801771

1681-
static pid_t mingw_spawnv(const char *cmd, const char **argv, int prepend_cmd)
1772+
static pid_t mingw_spawnv(const char *cmd, const char **argv,
1773+
const char *prepend_cmd)
16821774
{
16831775
return mingw_spawnve_fd(cmd, argv, NULL, NULL, prepend_cmd, 0, 1, 2);
16841776
}
@@ -1706,14 +1798,14 @@ pid_t mingw_spawnvpe(const char *cmd, const char **argv, char **deltaenv,
17061798
pid = -1;
17071799
}
17081800
else {
1709-
pid = mingw_spawnve_fd(iprog, argv, deltaenv, dir, 1,
1801+
pid = mingw_spawnve_fd(iprog, argv, deltaenv, dir, interpr,
17101802
fhin, fhout, fherr);
17111803
free(iprog);
17121804
}
17131805
argv[0] = argv0;
17141806
}
17151807
else
1716-
pid = mingw_spawnve_fd(prog, argv, deltaenv, dir, 0,
1808+
pid = mingw_spawnve_fd(prog, argv, deltaenv, dir, NULL,
17171809
fhin, fhout, fherr);
17181810
free(prog);
17191811
}
@@ -1739,7 +1831,7 @@ static int try_shell_exec(const char *cmd, char *const *argv)
17391831
ALLOC_ARRAY(argv2, argc + 1);
17401832
argv2[0] = (char *)cmd; /* full path to the script file */
17411833
memcpy(&argv2[1], &argv[1], sizeof(*argv) * argc);
1742-
pid = mingw_spawnv(prog, argv2, 1);
1834+
pid = mingw_spawnv(prog, argv2, interpr);
17431835
if (pid >= 0) {
17441836
int status;
17451837
if (waitpid(pid, &status, 0) < 0)
@@ -1759,7 +1851,7 @@ int mingw_execv(const char *cmd, char *const *argv)
17591851
if (!try_shell_exec(cmd, argv)) {
17601852
int pid, status;
17611853

1762-
pid = mingw_spawnv(cmd, (const char **)argv, 0);
1854+
pid = mingw_spawnv(cmd, (const char **)argv, NULL);
17631855
if (pid < 0)
17641856
return -1;
17651857
if (waitpid(pid, &status, 0) < 0)

‎config.mak.uname

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -685,6 +685,72 @@ else
685685
NO_CURL = YesPlease
686686
endif
687687
endif
688+
ifeq (i686,$(uname_M))
689+
MINGW_PREFIX := mingw32
690+
endif
691+
ifeq (x86_64,$(uname_M))
692+
MINGW_PREFIX := mingw64
693+
endif
694+
695+
DESTDIR_WINDOWS = $(shell cygpath -aw '$(DESTDIR_SQ)')
696+
DESTDIR_MIXED = $(shell cygpath -am '$(DESTDIR_SQ)')
697+
install-mingit-test-artifacts:
698+
install -m755 -d '$(DESTDIR_SQ)/usr/bin'
699+
printf '%s\n%s\n' >'$(DESTDIR_SQ)/usr/bin/perl' \
700+
"#!/mingw64/bin/busybox sh" \
701+
"exec \"$(shell cygpath -am /usr/bin/perl.exe)\" \"\$$@\""
702+
703+
install -m755 -d '$(DESTDIR_SQ)'
704+
printf '%s%s\n%s\n%s\n%s\n%s\n' >'$(DESTDIR_SQ)/init.bat' \
705+
"PATH=$(DESTDIR_WINDOWS)\\$(MINGW_PREFIX)\\bin;" \
706+
"C:\\WINDOWS;C:\\WINDOWS\\system32" \
707+
"@set GIT_TEST_INSTALLED=$(DESTDIR_MIXED)/$(MINGW_PREFIX)/bin" \
708+
"@`echo "$(DESTDIR_WINDOWS)" | sed 's/:.*/:/'`" \
709+
"@cd `echo "$(DESTDIR_WINDOWS)" | sed 's/^.://'`\\test-git\\t" \
710+
"@echo Now, run 'helper\\test-run-command testsuite'"
711+
712+
install -m755 -d '$(DESTDIR_SQ)/$(MINGW_PREFIX)/bin'
713+
install -m755 git.exe git-credential-store.exe git-fast-import.exe \
714+
git-http-fetch.exe git-http-push.exe git-receive-pack.exe \
715+
git-remote-http.exe git-remote-https.exe \
716+
git-sh-i18n--envsubst.exe git-show-index.exe \
717+
git-upload-pack.exe '$(DESTDIR_SQ)/$(MINGW_PREFIX)/bin'
718+
719+
install -m755 -d '$(DESTDIR_SQ)/$(MINGW_PREFIX)/libexec/git-core'
720+
cp git-bisect git-difftool--helper git-filter-branch git-instaweb \
721+
git-merge-octopus git-merge-one-file git-merge-resolve \
722+
git-mergetool git-mergetool--lib git-parse-remote \
723+
git-quiltimport git-rebase git-rebase--am \
724+
git-rebase--interactive git-rebase--merge git-request-pull \
725+
git-sh-i18n git-sh-setup git-stash git-submodule \
726+
git-web--browse '$(DESTDIR_SQ)/$(MINGW_PREFIX)/libexec/git-core'
727+
728+
install -m755 -d '$(DESTDIR_SQ)/test-git'
729+
sed 's/^\(NO_PERL\|NO_PYTHON\)=.*/\1=YesPlease/' \
730+
<GIT-BUILD-OPTIONS >'$(DESTDIR_SQ)/test-git/GIT-BUILD-OPTIONS'
731+
732+
install -m755 -d '$(DESTDIR_SQ)/test-git/t/helper'
733+
install -m755 $(TEST_PROGRAMS) '$(DESTDIR_SQ)/test-git/t/helper'
734+
(cd t && $(TAR) cf - t[0-9][0-9][0-9][0-9] diff-lib) | \
735+
(cd '$(DESTDIR_SQ)/test-git/t' && $(TAR) xf -)
736+
install -m755 t/t556x_common t/*.sh '$(DESTDIR_SQ)/test-git/t'
737+
738+
install -m755 -d '$(DESTDIR_SQ)/test-git/templates'
739+
(cd templates && $(TAR) cf - blt) | \
740+
(cd '$(DESTDIR_SQ)/test-git/templates' && $(TAR) xf -)
741+
742+
# po/build/locale for t0200
743+
install -m755 -d '$(DESTDIR_SQ)/test-git/po/build/locale'
744+
(cd po/build/locale && $(TAR) cf - .) | \
745+
(cd '$(DESTDIR_SQ)/test-git/po/build/locale' && $(TAR) xf -)
746+
747+
# git-daemon.exe for t5802, git-http-backend.exe for t5560
748+
install -m755 git-daemon.exe git-http-backend.exe \
749+
'$(DESTDIR_SQ)/$(MINGW_PREFIX)/bin'
750+
751+
# git-remote-testgit for t5801
752+
install -m755 git-remote-testgit \
753+
'$(DESTDIR_SQ)/$(MINGW_PREFIX)/libexec/git-core'
688754
endif
689755
ifeq ($(uname_S),QNX)
690756
COMPAT_CFLAGS += -DSA_RESTART=0

‎connect.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -825,6 +825,9 @@ struct child_process *git_connect(int fd[2], const char *url,
825825
child_process_init(conn);
826826

827827
strbuf_addstr(&cmd, prog);
828+
/* Prefer the builtin */
829+
if (starts_with(prog, "git-"))
830+
cmd.buf[3] = ' ';
828831
strbuf_addch(&cmd, ' ');
829832
sq_quote_buf(&cmd, path);
830833

‎git-sh-setup.sh

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -332,17 +332,30 @@ create_virtual_base() {
332332
# Platform specific tweaks to work around some commands
333333
case $(uname -s) in
334334
*MINGW*)
335-
# Windows has its own (incompatible) sort and find
336-
sort () {
337-
/usr/bin/sort "$@"
338-
}
339-
find () {
340-
/usr/bin/find "$@"
341-
}
342-
# git sees Windows-style pwd
343-
pwd () {
344-
builtin pwd -W
345-
}
335+
if test -x /usr/bin/sort
336+
then
337+
# Windows has its own (incompatible) sort; override
338+
sort () {
339+
/usr/bin/sort "$@"
340+
}
341+
fi
342+
if test -x /usr/bin/find
343+
then
344+
# Windows has its own (incompatible) find; override
345+
find () {
346+
/usr/bin/find "$@"
347+
}
348+
fi
349+
# On Windows, Git wants Windows paths. But /usr/bin/pwd spits out
350+
# Unix-style paths. At least in Bash, we have a builtin pwd that
351+
# understands the -W option to force "mixed" paths, i.e. with drive
352+
# prefix but still with forward slashes. Let's use that, if available.
353+
if type builtin >/dev/null 2>&1
354+
then
355+
pwd () {
356+
builtin pwd -W
357+
}
358+
fi
346359
is_absolute_path () {
347360
case "$1" in
348361
[/\\]* | [A-Za-z]:*)

‎run-command.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1533,7 +1533,7 @@ static int pp_start_one(struct parallel_processes *pp)
15331533
if (start_command(&pp->children[i].process)) {
15341534
code = pp->start_failure(&pp->children[i].err,
15351535
pp->data,
1536-
&pp->children[i].data);
1536+
pp->children[i].data);
15371537
strbuf_addbuf(&pp->buffered_output, &pp->children[i].err);
15381538
strbuf_reset(&pp->children[i].err);
15391539
if (code)
@@ -1601,7 +1601,7 @@ static int pp_collect_finished(struct parallel_processes *pp)
16011601

16021602
code = pp->task_finished(code,
16031603
&pp->children[i].err, pp->data,
1604-
&pp->children[i].data);
1604+
pp->children[i].data);
16051605

16061606
if (code)
16071607
result = code;

‎t/.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
t[0-9][0-9][0-9][0-9]/* -whitespace
22
/diff-lib/* eol=lf
3+
/diff-lib/*.png binary
34
/t0110/url-* binary
45
/t3900/*.txt eol=lf
56
/t3901/*.txt eol=lf

‎t/test-binary-1.png renamed to ‎t/diff-lib/test-binary-1.png

File renamed without changes.

‎t/test-binary-2.png renamed to ‎t/diff-lib/test-binary-2.png

File renamed without changes.

0 commit comments

Comments
 (0)