lock_packed_refs(): take a `packed_ref_store *` parameter

diff --git a/git-stash.sh b/git-stash.sh
index 13711764a90c122256272cb754a0f96cf333f0e3..2fb651b2b8d9d91a130b1cbd11c3c2b6b1cf961b 100755 (executable)
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -314,7 +314,9 @@ push_stash () {
 
                if test "$keep_index" = "t" && test -n "$i_tree"
                then
-                       git read-tree --reset -u $i_tree
+                       git read-tree --reset $i_tree
+                       git ls-files -z --modified -- "$@" |
+                       git checkout-index -z --force --stdin
                fi
        else
                git apply -R < "$TMP-patch" ||