Browse Source

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

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 10 years ago
parent
commit
bfb539bb73
  1. 2
      git-stash.sh
  2. 7
      t/t3903-stash.sh

2
git-stash.sh

@ -457,8 +457,6 @@ apply_stash () { @@ -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) ||

7
t/t3903-stash.sh

@ -45,13 +45,6 @@ test_expect_success 'applying bogus stash does nothing' ' @@ -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…
Cancel
Save