Hi, On Wed, 28 Nov 2018, Ævar Arnfjörð Bjarmason wrote: > On Tue, Nov 27 2018, Johannes Schindelin wrote: > > > On Mon, 26 Nov 2018, Junio C Hamano wrote: > > > >> Paul-Sebastian Ungureanu <ungureanupaulsebastian@xxxxxxxxx> writes: > >> > >> > The old shell script `git-stash.sh` was removed and replaced > >> > entirely by `builtin/stash.c`. In order to do that, `create` and > >> > `push` were adapted to work without `stash.sh`. For example, before > >> > this commit, `git stash create` called `git stash--helper create > >> > --message "$*"`. If it called `git 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. > >> > >> Seeing the recent trouble in "rebase in C" and how keeping the > >> scripted version as "git legacy-rebase" helped us postpone the > >> rewritten version without ripping the whole thing out, I wonder if > >> we can do the same here. > > > > Feel very free to cherry-pick > > https://github.com/git-for-windows/git/commit/004da7e7faa36c872868ae938e06594ea1c2f01c > > and > > https://github.com/git-for-windows/git/commit/cedfcd39f5a4e4beb33e16fa67c4659fd4bdabf6 > > which is what we carry in Git for Windows. > > ...and then something similar to 62c23938fa ("tests: add a special setup > where rebase.useBuiltin is off", 2018-11-14) so those of us who're > smoking next for bugs can test both and report if some of the test > setups (odd OS's etc) show a difference in behavior. I allowed myself to make those changes, and to reorder the last three patches as asked by Junio. Paul, please find the result at https://github.com/dscho/git as `git-stash`. If you agree with it, I would be delighted if you resubmitted it directly after Git v2.20.0 is released (Junio, it seemed that -rc1 slipped a couple of days, and now -rc2, too, any word when you think the final v2.20.0 is due?). Thanks, Dscho