git-stash: do not remove a ref by hand.

diff --git a/git-stash.sh b/git-stash.sh
index 7b1638c68c796aee4a108263dc45b650f7bc987c..f90dffd4caf88d649a9998a43aee18e57d3f594f 100755 (executable)
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -6,6 +6,7 @@ USAGE='[ | list | show | apply | clear]'
 SUBDIRECTORY_OK=Yes
 . git-sh-setup
 require_work_tree
+cd_to_toplevel
 
 TMP="$GIT_DIR/.git-stash.$$"
 trap 'rm -f "$TMP-*"' 0
@@ -18,9 +19,10 @@ no_changes () {
 }
 
 clear_stash () {
-       logfile="$GIT_DIR/logs/$ref_stash" &&
-       mkdir -p "$(dirname "$logfile")" &&
-       : >"$logfile"
+       if current=$(git rev-parse --verify $ref_stash 2>/dev/null)
+       then
+               git update-ref -d refs/stash $current
+       fi
 }
 
 save_stash () {
@@ -58,11 +60,11 @@ save_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" &&
                export GIT_INDEX_FILE &&
-
-               rm -f "$TMP-index" &&
-               git read-tree $i_tree &&
+               git read-tree -m $i_tree &&
                git add -u &&
                git write-tree &&
                rm -f "$TMP-index"
@@ -112,6 +114,13 @@ apply_stash () {
        git diff-files --quiet ||
                die 'Cannot restore on top of a dirty state'
 
+       unstash_index=
+       case "$1" in
+       --index)
+               unstash_index=t
+               shift
+       esac
+
        # current index state
        c_tree=$(git write-tree) ||
                die 'Cannot apply a stash in the middle of a merge'
@@ -121,6 +130,15 @@ apply_stash () {
        b_tree=$(git rev-parse --verify "$s^:") ||
                die "$*: no valid stashed state found"
 
+       test -z "$unstash_index" || {
+               git diff --binary $s^2^..$s^2 | git apply --cached
+               test $? -ne 0 &&
+                       die 'Conflicts in index. Try without --index.'
+               unstashed_index_tree=$(git-write-tree) ||
+                       die 'Could not save index tree'
+               git reset
+       }
+
        eval "
                GITHEAD_$w_tree='Stashed changes' &&
                GITHEAD_$c_tree='Updated upstream' &&
@@ -138,9 +156,12 @@ apply_stash () {
                        die "Cannot unstage modified files"
                git-status
                rm -f "$a"
+               test -z "$unstash_index" || git read-tree $unstashed_index_tree
        else
                # Merge conflict; keep the exit status from merge-recursive
-               exit
+               status=$?
+               test -z "$unstash_index" || echo 'Index was not unstashed.' >&2
+               exit $status
        fi
 }