From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 7 Jul 2007 20:38:06 +0000 (-0700)
Subject: Merge branch 'js/stash'
X-Git-Tag: v1.5.3-rc1~54
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6abe0f0383a9b77266810df0d1109b6d0783906e?ds=inline;hp=-c

Merge branch 'js/stash'

* js/stash:
Teach git-stash to "apply --index"
---

6abe0f0383a9b77266810df0d1109b6d0783906e
diff --combined git-stash.sh
index 7b1638c68c,5c63ca5bce..eac5551380
--- a/git-stash.sh
+++ b/git-stash.sh
@@@ -3,7 -3,6 +3,7 @@@
  
  USAGE='[ | list | show | apply | clear]'
  
 +SUBDIRECTORY_OK=Yes
  . git-sh-setup
  require_work_tree
  
@@@ -112,6 -111,13 +112,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 -127,15 +128,15 @@@
  	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 -153,12 +154,12 @@@
  			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
  }