Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge Git for Windows v2.33.0(2) #436

Merged
merged 9 commits into from
Oct 4, 2021
Merged

Merge Git for Windows v2.33.0(2) #436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3cf9bb3
ci: use upload-artifacts v1 for dockerized jobs
carenas Aug 13, 2021
d629921
fixup! clean: do not traverse mount points
dscho Aug 23, 2021
7b052e6
fixup! mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' syst…
dscho Aug 23, 2021
626897c
Merge pull request #3387 from gitgitgadget/cb/ci-use-upload-artifacts-v1
dscho Aug 23, 2021
72648d9
fixup! mingw: implement a platform-specific `strbuf_realpath()`
dscho Aug 23, 2021
16db707
Merge a fixup
dscho Aug 23, 2021
55d9203
Merge another fixup
dscho Aug 23, 2021
2335b45
Merge yet another fixup
dscho Aug 23, 2021
8735530
fixup! mingw: support long paths
dscho Aug 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ jobs:
if: failure()
- name: Upload failed tests' directories
if: failure() && env.FAILED_TEST_ARTIFACTS != ''
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v1
with:
name: failed-tests-${{matrix.vector.jobname}}
path: ${{env.FAILED_TEST_ARTIFACTS}}
Expand Down
1 change: 1 addition & 0 deletions compat/mingw.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,6 +472,7 @@ extern int (*win32_is_mount_point)(struct strbuf *path);
#define PATH_SEP ';'
char *mingw_query_user_email(void);
#define query_user_email mingw_query_user_email
struct strbuf;
char *mingw_strbuf_realpath(struct strbuf *resolved, const char *path);
#define platform_strbuf_realpath mingw_strbuf_realpath
#if !defined(__MINGW64_VERSION_MAJOR) && (!defined(_MSC_VER) || _MSC_VER < 1800)
Expand Down