diff options
author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2024-10-30 01:12:41 +0100 |
---|---|---|
committer | Johannes Schindelin <johannes.schindelin@gmx.de> | 2024-11-26 22:15:02 +0100 |
commit | 3fad508c3f5d51c017c9ab5760ef492c11668313 (patch) | |
tree | 14cf9a8efb024b480a565ed7c2122878d7429542 /t/t7300-clean.sh | |
parent | Git 2.47.1 (diff) | |
parent | Git 2.46.3 (diff) | |
download | git-3fad508c3f5d51c017c9ab5760ef492c11668313.tar.xz git-3fad508c3f5d51c017c9ab5760ef492c11668313.zip |
Sync with 2.46.3
* maint-2.46:
Git 2.46.3
Git 2.45.3
Git 2.44.3
Git 2.43.6
Git 2.42.4
Git 2.41.3
Git 2.40.4
credential: disallow Carriage Returns in the protocol by default
credential: sanitize the user prompt
credential_format(): also encode <host>[:<port>]
t7300: work around platform-specific behaviour with long paths on MinGW
compat/regex: fix argument order to calloc(3)
mingw: drop bogus (and unneeded) declaration of `_pgmptr`
ci: remove 'Upload failed tests' directories' step from linux32 jobs
Diffstat (limited to 't/t7300-clean.sh')
-rwxr-xr-x | t/t7300-clean.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh index 0aae0dee67..12ab25296b 100755 --- a/t/t7300-clean.sh +++ b/t/t7300-clean.sh @@ -747,7 +747,7 @@ test_expect_success MINGW 'handle clean & core.longpaths = false nicely' ' test_must_fail git clean -xdf 2>.git/err && # grepping for a strerror string is unportable but it is OK here with # MINGW prereq - test_grep "too long" .git/err + test_grep -e "too long" -e "No such file or directory" .git/err ' test_expect_success 'clean untracked paths by pathspec' ' |