summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-03-23 04:38:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-03-23 04:38:25 (GMT)
commit281ee1d0c2c3f73bdc9012a5ac52feff97f72acd (patch)
treea75d0c656c57c9de8433a30dd06b2a4fb391c130
parentf9249ecfa9af0325f6b9ff80e4cc423f5fe70bb4 (diff)
parent3ba2e8653c88d220b0b22f35260477bb0afa7d7b (diff)
downloadgit-281ee1d0c2c3f73bdc9012a5ac52feff97f72acd.zip
git-281ee1d0c2c3f73bdc9012a5ac52feff97f72acd.tar.gz
git-281ee1d0c2c3f73bdc9012a5ac52feff97f72acd.tar.bz2
Merge branch 'js/maint-stash-index-copy'
* js/maint-stash-index-copy: stash: copy the index using --index-output instead of cp -p stash: fix incorrect quoting in cleanup of temporary files
-rwxr-xr-xgit-stash.sh11
1 files changed, 5 insertions, 6 deletions
diff --git a/git-stash.sh b/git-stash.sh
index 7561b37..5130228 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -17,7 +17,8 @@ require_work_tree
cd_to_toplevel
TMP="$GIT_DIR/.git-stash.$$"
-trap 'rm -f "$TMP-*"' 0
+TMPindex=${GIT_INDEX_FILE-"$GIT_DIR/index"}.stash.$$
+trap 'rm -f "$TMP-"* "$TMPindex"' 0
ref_stash=refs/stash
@@ -81,14 +82,12 @@ create_stash () {
# state of the working tree
w_tree=$( (
- rm -f "$TMP-index" &&
- cp -p ${GIT_INDEX_FILE-"$GIT_DIR/index"} "$TMP-index" &&
- GIT_INDEX_FILE="$TMP-index" &&
+ git read-tree --index-output="$TMPindex" -m $i_tree &&
+ GIT_INDEX_FILE="$TMPindex" &&
export GIT_INDEX_FILE &&
- git read-tree -m $i_tree &&
git diff --name-only -z HEAD | git update-index -z --add --remove --stdin &&
git write-tree &&
- rm -f "$TMP-index"
+ rm -f "$TMPindex"
) ) ||
die "Cannot save the current worktree state"