mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
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"
This commit is contained in:
commit
351d06df51
|
@ -457,8 +457,6 @@ apply_stash () {
|
|||
assert_stash_like "$@"
|
||||
|
||||
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
|
||||
c_tree=$(git write-tree) ||
|
||||
|
|
|
@ -45,13 +45,6 @@ test_expect_success 'applying bogus stash does nothing' '
|
|||
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' '
|
||||
echo 4 >other-file &&
|
||||
git stash apply &&
|
||||
|
|
Loading…
Reference in a new issue