Merge branch 'bg/xcalloc-nmemb-then-size' into maint

diff --git a/git-stash.sh b/git-stash.sh
index 4798bcf0e51b705005215e9a6339310defe16d03..4621d81fab472310e1183c1b9914644259a911e8 100755 (executable)
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -94,7 +94,8 @@ create_stash () {
                # ease of unpacking later.
                u_commit=$(
                        untracked_files | (
-                               export GIT_INDEX_FILE="$TMPindex"
+                               GIT_INDEX_FILE="$TMPindex" &&
+                               export GIT_INDEX_FILE &&
                                rm -f "$TMPindex" &&
                                git update-index -z --add --remove --stdin &&
                                u_tree=$(git write-tree) &&