I've been working on converting all of git stash to be a builtin, however it's hard to get it all working at once with limited time, so I've moved around half of it to a new stash--helper builtin and called these functions from the shell script. Once this is stabalized, it should be easier to convert the rest of the commands one at a time without breaking anything. I've sent most of this code before, but that was targetting a full replacement of stash. The code is overall the same, but with some code review changes and updates for internal api changes. Joel Teichroeb (2): merge: close the index lock when not writing the new index stash: implement builtin stash helper Makefile | 1 + builtin.h | 1 + builtin/stash--helper.c | 516 ++++++++++++++++++++++++++++++++++++++++++++++++ git-stash.sh | 134 +------------ git.c | 1 + merge-recursive.c | 9 +- 6 files changed, 532 insertions(+), 130 deletions(-) create mode 100644 builtin/stash--helper.c -- 2.15.0