Skip to content

Commit 26a43ff

Browse files
committed
mingw: only use Bash-ism builtin pwd -W when available
Traditionally, Git for Windows' SDK uses Bash as its default shell. However, other Unix shells are available, too. Most notably, the Win32 port of BusyBox comes with `ash` whose `pwd` command already prints Windows paths as Git for Windows wants them, while there is not even a `builtin` command. Therefore, let's be careful not to override `pwd` unless we know that the `builtin` command is available. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 2cc541d commit 26a43ff

File tree

2 files changed

+20
-8
lines changed

2 files changed

+20
-8
lines changed

git-sh-setup.sh

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -346,10 +346,16 @@ case $(uname -s) in
346346
/usr/bin/find "$@"
347347
}
348348
fi
349-
# git sees Windows-style pwd
350-
pwd () {
351-
builtin pwd -W
352-
}
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
353359
is_absolute_path () {
354360
case "$1" in
355361
[/\\]* | [A-Za-z]:*)

t/test-lib.sh

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1247,10 +1247,16 @@ case $uname_s in
12471247
/usr/bin/find "$@"
12481248
}
12491249
fi
1250-
# git sees Windows-style pwd
1251-
pwd () {
1252-
builtin pwd -W
1253-
}
1250+
# On Windows, Git wants Windows paths. But /usr/bin/pwd spits out
1251+
# Unix-style paths. At least in Bash, we have a builtin pwd that
1252+
# understands the -W option to force "mixed" paths, i.e. with drive
1253+
# prefix but still with forward slashes. Let's use that, if available.
1254+
if type builtin >/dev/null 2>&1
1255+
then
1256+
pwd () {
1257+
builtin pwd -W
1258+
}
1259+
fi
12541260
# no POSIX permissions
12551261
# backslashes in pathspec are converted to '/'
12561262
# exec does not inherit the PID

0 commit comments

Comments
 (0)