kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'jk/stash-require-clean-index' into maint 

A hotfix for the topic already in 'master'.

* jk/stash-require-clean-index:
  Revert "stash: require a clean index to apply"
maint
Junio C Hamano 2015-06-25 23:03:26 -07:00
parent b1f0802e91 19376104a8
commit 351d06df51
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-stash.sh
View File

@ -457,8 +457,6 @@ apply_stash () {
assert_stash_like "$@" assert_stash_like "$@"


git update-index -q --refresh || die "$(gettext "unable to refresh index")" git update-index -q --refresh || die "$(gettext "unable to refresh index")"
git diff-index --cached --quiet --ignore-submodules HEAD -- ||
die "$(gettext "Cannot apply stash: Your index contains uncommitted changes.")"


# current index state # current index state
c_tree=$(git write-tree) || c_tree=$(git write-tree) ||

7
t/t3903-stash.sh
View File

@ -45,13 +45,6 @@ test_expect_success 'applying bogus stash does nothing' '
test_cmp expect file test_cmp expect file
' '


test_expect_success 'apply requires a clean index' '
test_when_finished "git reset --hard" &&
echo changed >other-file &&
git add other-file &&
test_must_fail git stash apply
'

test_expect_success 'apply does not need clean working directory' ' test_expect_success 'apply does not need clean working directory' '
echo 4 >other-file && echo 4 >other-file &&
git stash apply && git stash apply &&