git stash is slow on windows
git-stash
is a script, not a command compiled in the git.exe
binary.
On linux : I can find git-stash
at /usr/lib/git-core/git-stash
- I will let you look for the correct path on windows ...
This script uses #!/bin/sh
to run, I don't know what shell implementation is used when you run this on windows.
You can try to run it with another compatible shell (here: bash) :
# the git-core/ dir needs to be in the PATH,
# obviously you will need to provide the correct path for your git-core dir
$ PATH=/usr/lib/git-core:$PATH bash /usr/lib/git-core/git-stash
You can also turn the -x
flag, which will print a trace of all commands executed, and visually check if one of the sub commands seems to be the hanger :
$ PATH=/usr/lib/git-core:$PATH bash -x /usr/lib/git-core/git-stash
With Git for Windows 2.19 (Sept. 2018), git stash
(and git rebase
) are no longer script-only, but actually a binary compiled with git.exe
.
See git-for-windows/build-extra PR 203.
To activate them, type:
git config --global rebase.useBuiltin true
git config --global stash.useBuiltin true
Warning:
As nice as the speed-ups are, the patches in question are still in flux, and they are not battle-tested at all.
So, for now, the script version of git stash
remains the default, that way:
- users who want the raw speed improvement we got through three Google Summer of Code projects working in parallel can have that,
- while others who are reluctant to play guinea pig by running only well-tested code can stay on the safe side.
The point remains: in the next versions of Git, the bash script for git-stash
will eventually disappear, and its replacement is and will be faster.
Note: that next version will be Git 2.27 (Q2 2020): "git stash
" has kept an escape hatch to use the scripted version for a few releases, which got stale.
It has been removed.
See commit 8a2cd3f, commit b0c7362 (03 Mar 2020) by Thomas Gummerer (tgummerer
).
(Merged by Junio C Hamano -- gitster
-- in commit 369ae75, 27 Mar 2020)
stash
: remove thestash.useBuiltin
settingSigned-off-by: Thomas Gummerer
Remove the
stash.useBuiltin
setting which was added as an escape hatch to disable the builtin version of stash first released with Git 2.22.Carrying the legacy version is a maintenance burden, and has in fact become out of date failing a test since the 2.23 release, without anyone noticing until now.
So users would be getting a hint to fall back to a potentially buggy version of the tool.
We used to shell out to
git config
to get theuseBuiltin
configuration to avoid changing any global state before spawning legacy-stash.
However that is no longer necessary, so just use the 'git_config
' function to get the setting instead.Similar to what we've done in d03ebd411c ("
rebase
: remove the rebase.useBuiltin setting", 2019-03-18, Git v2.22.0-rc0 -- merge listed in batch #5), where we remove the corresponding setting for rebase, we leave the documentation in place, so people can refer back to it when searching for it online, and so we can refer to it in the commit message.
Update Q2 2019, with Git 2.22, git stash
is entirely rewritten in C.
²
See commit 40af146, commit 48ee24a, commit ef0f0b4, commit 64fe9c2, commit 1ac528c, commit d553f53, commit d4788af, commit 41e0dd5, commit dc7bd38, commit 130f269, commit bef55dc, commit dac566c, commit ab8ad46 (25 Feb 2019) by Paul-Sebastian Ungureanu (weekly-digest[bot]
).
See commit c4de61d, commit 577c199, commit 4e2dd39, commit 8a0fc8d (25 Feb 2019) by Joel Teichroeb (klusark
).
See commit 7906af0, commit 90a4627, commit 8d8e9c2 (25 Feb 2019) by Johannes Schindelin (dscho
).
(Merged by Junio C Hamano -- gitster
-- in commit e36adf7, 22 Apr 2019)
You can still use the shell script with git legacy-stash
.
And:
stash
: convertstash--helper.c
intostash.c
The old shell script
git-stash.sh
was removed and replaced entirely bybuiltin/stash.c
.
In order to do that,create
andpush
were adapted to work withoutstash.sh
.For example, before this commit,
git stash create
calledgit stash--helper create --message "$*"
. If it calledgit stash--helper create "$@"
, then some of these changes wouldn't have been necessary.This commit also removes the word
helper
since now stash is called directly and not by a shell script.
There are optimizations:
stash
: optimizeget_untracked_files()
andcheck_changes()
This commits introduces a optimization by avoiding calling the same functions again.
For example,git stash push -u
would call at some points the following functions:
check_changes()
(insidedo_push_stash()
)do_create_stash()
, which calls:check_changes()
andget_untracked_files()
Note that
check_changes()
also callsget_untracked_files()
.
So,check_changes()
is called 2 times andget_untracked_files()
3 times.The old function
check_changes()
now consists of two functions:get_untracked_files()
andcheck_changes_tracked_files()
.These are the call chains for
push
andcreate
:
push_stash()
->do_push_stash()
->do_create_stash()
create_stash()
->do_create_stash()
To prevent calling the same functions over and over again,
check_changes()
insidedo_create_stash()
is now placed in the caller functions (create_stash()
anddo_push_stash()
).
This waycheck_changes()
andget_untracked files()
are called only one time.
With Git 2.36 (Q2 2022), removal of the warning "the stash.useBuiltin support has been removed!
" is finally done!
See commit e9b272e, commit deeaf5e, commit 5d4dc38, commit 6de0722 (27 Jan 2022) by Johannes Schindelin (dscho
).
(Merged by Junio C Hamano -- gitster
-- in commit b9f791a, 16 Feb 2022)
stash
: stop warning about the obsoletestash.useBuiltin
config settingSigned-off-by: Johannes Schindelin
In 8a2cd3f ("
stash
: remove the stash.useBuiltin setting", 2020-03-03, Git v2.27.0-rc0 -- merge listed in batch #2), we removed support forstash.useBuiltin
, but left a warning in its place.After almost two years, and several major versions, it is time to remove even that warning.