Rebase to v2.21.0 #2072
Merged
Rebase to v2.21.0 #2072
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
For many Win32 functions, there actually exist two variants: one with the `A` suffix that takes ANSI parameters (`char *` or `const char *`) and one with the `W` suffix that takes Unicode parameters (`wchar_t *` or `const wchar_t *`). Let's be precise what we want to use. Signed-off-by: Johannes Schindelin <[email protected]>
This topic branch adds the (experimental) --stdin/-z options to `git reset`. Those patches are still under review in the upstream Git project, but are already merged in their experimental form into Git for Windows' `master` branch, in preparation for a MinGit-only release. Signed-off-by: Johannes Schindelin <[email protected]>
This used to be "Merge pull request git-for-windows#938 from virtuald/patch-1" git-cvsexportcommit.perl: Force crlf translation Signed-off-by: Johannes Schindelin <[email protected]>
These fixes were necessary for Sverre Rabbelier's remote-hg to work, but for some magic reason they are not necessary for the current remote-hg. Makes you wonder how that one gets away with it. Signed-off-by: Johannes Schindelin <[email protected]>
This works around the push-over-git-protocol issues pointed out in msysgit#101. Signed-off-by: Johannes Schindelin <[email protected]>
Address Space Layout Randomization (ASLR) allows executables' memory layout to change at random between runs, and therefore offers a quite decent protection against many attacks. We enable ASLR because MSYS2's C compiler offers support for ASLR, and whatever performance impact it has is neglible, according to https://insights.sei.cmu.edu/cert/2014/02/differences-between-aslr-on-windows-and-linux.html This merges the part of git-for-windows#612 that does not break Git ;-) This fixes git-for-windows#608 Signed-off-by: Johannes Schindelin <[email protected]>
This came in via pull request git-for-windows#677 from yaras/fix-git-675 Fixed masking username with asterisks when reading credentials Signed-off-by: Johannes Schindelin <[email protected]>
This was pull request git-for-windows#1003 from shoelzer/master poll: Use GetTickCount64 to avoid wraparound issues Signed-off-by: Johannes Schindelin <[email protected]>
The fix we introduced in Git for Windows will be made obsolete by a more general fix that has been already accepted into upstream Git's `next` branch. But we still can introduce a regression test that verifies that this bug will be caught very quickly, if reintroduced. Signed-off-by: Johannes Schindelin <[email protected]>
This fixes a bug where a .git directory at the root of a network share (e.g. \\MYSERVER\sharedfolder\.git) was not handled correctly. Signed-off-by: Johannes Schindelin <[email protected]>
…er/register_rename_src diffcore-rename: speed up register_rename_src
This topic branch allows us to specify absolute paths without the drive prefix e.g. when cloning. Example: C:\Users\me> git clone https://github.com/git/git \upstream-git This will clone into a new directory C:\upstream-git, in line with how Windows interprets absolute paths. Signed-off-by: Johannes Schindelin <[email protected]>
Fix fetching from UNC paths. Signed-off-by: Johannes Schindelin <[email protected]>
This topic branch teaches Git to accept UNC paths of the form file://host/share/repository.git. Signed-off-by: Johannes Schindelin <[email protected]>
When compiling Git with a runtime prefix (so that it can be installed into any location, finding its libexec/ directory relative to the location of the `git` executable), it is convenient to provide "absolute" Unix-y paths e.g. for http.sslCAInfo, and have those absolute paths be resolved relative to the runtime prefix. This patch makes it so for Windows. It is up for discussion whether we want this for other platforms, too, as long as building with RUNTIME_PREFIX. Signed-off-by: Johannes Schindelin <[email protected]>
Fix t0001 when the current working directory differs in case from the canonical form
…fallback [Outreachy] Removed ipv6 fallback
Add a helper function to start GDB that was already attached to the current process
This topic branch avoids spawning `gzip` when asking `git archive` to create `.tar.gz` files. Signed-off-by: Johannes Schindelin <[email protected]>
Signed-off-by: Johannes Schindelin <[email protected]>
Signed-off-by: Johannes Schindelin <[email protected]>
We no longer use MakeMaker, so let's not state in the MINGW section that we do not want to use it... Signed-off-by: Johannes Schindelin <[email protected]>
This branch introduces support for reading the "Windows-wide" Git configuration from `%PROGRAMDATA%\Git\config`. As these settings are intended to be shared between *all* Git-related software, that config file takes an even lower precedence than `$(prefix)/etc/gitconfig`. Signed-off-by: Johannes Schindelin <[email protected]>
mingw: safeguard against compiling with `-DUNICODE`
Since v2.9.0, Git knows about the config variable core.hookspath that allows overriding the path to the directory containing the Git hooks. Since v2.10.0, the `--git-path` option respects that config variable, too, so we may just as well use that command. For Git versions older than v2.5.0 (which was the first version to support the `--git-path` option for the `rev-parse` command), we simply fall back to the previous code. This fixes git-for-windows#1755 Initial-patch-by: Philipp Gortan <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>
This addresses git-for-windows#521 Signed-off-by: Johannes Schindelin <[email protected]>
This change lets us spawn .bat scripts whose paths contain spaces. Signed-off-by: Johannes Schindelin <[email protected]>
…er/fscache_nfd fscache: add not-found directory cache to fscache
Git for Windows supports the core.longPaths config setting to allow writing/reading long paths via the \\?\ trick for a long time now. However, for that support to work, it is absolutely necessary that git_default_config() is given a chance to parse the config. Otherwise Git will be non the wiser. So let's make sure that as many commands that previously failed to parse the core.* settings now do that, implicitly enabling long path support in a lot more places. Note: this is not a perfect solution, and it cannot be, as there is a chicken-and-egg problem in reading the config itself... This fixes git-for-windows#1218 Signed-off-by: Johannes Schindelin <[email protected]>
…er/add_preload_fscache add: use preload-index and fscache for performance
…xcludes_with_fscache dir.c: make add_excludes aware of fscache during status
fetch-pack.c: enable fscache for stats under .git/objects
…t_flush checkout.c: enable fscache for checkout again Signed-off-by: Johannes Schindelin <[email protected]>
This was pull request git-for-windows#1645 from ZCube/master Support windows container. Signed-off-by: Johannes Schindelin <[email protected]>
…_index Enable the filesystem cache (fscache) in refresh_index().
…-gfw fscache: use FindFirstFileExW to avoid retrieving the short name
…ter-status-gfw status: disable and free fscache at the end of the status command
…e-gfw fscache: add GIT_TEST_FSCACHE support
…ter-add-gfw At the end of the add command, disable and free the fscache
…ics-gfw fscache: add fscache hit statistics
This brings substantial wins in performance because the FSCache is now per-thread, being merged to the primary thread only at the end, so we do not have to lock (except while merging). Signed-off-by: Johannes Schindelin <[email protected]>
…safe-enable-gfw fscache: make fscache_enable() thread safe
…DirectoryFile-gfw fscache: teach fscache to use NtQueryDirectoryFile
Signed-off-by: Johannes Schindelin <[email protected]>
Handle Ctrl+C in Git Bash nicely Signed-off-by: Johannes Schindelin <[email protected]>
This fixes the issue identified in git-for-windows#1498 where Git would not fall back to reading credentials from a Win32 Console when the credentials could not be read from the terminal via the Bash hack (that is necessary to support running in a MinTTY). Tested in a Powershell window. Signed-off-by: Johannes Schindelin <[email protected]>
Add a README.md for GitHub goodness. Signed-off-by: Johannes Schindelin <[email protected]>
To avoid having to play tricks as in earlier rounds, we bit the sour apple and rebased the `builtin-stash-rebase-v3` branch thicket onto the commit starting Git for Windows' merging-rebase. (The merging-rebase pulls in the previous branch thicket via a "fake merge", i.e. a merge commit that does not actually apply any changes from the merged commit history. This has the unfortunate side effect of confusing `merge` into thinking that any branch that was merged into an earlier round does not need to be merged again.) Signed-off-by: Johannes Schindelin <[email protected]>
This branch allows third-party tools to call `git status --no-lock-index` to avoid lock contention with the interactive Git usage of the actual human user. Signed-off-by: Johannes Schindelin <[email protected]>
…ored-directory-gracefully Phase out `--show-ignored-directory` gracefully
dscho
force-pushed
the
rebase-to-v2.21.0
branch
from
9a7f57a to
0fd7b8c
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR serves mainly to run the CI build & test, in preparation for publishing Git for Windows v2.21.0-rc1/-rc2 and final.
We will "merge" this into
masterby pushing the tip commit (this is necessary to maintain a clean merging-rebase chain).