File tree Expand file tree Collapse file tree 2 files changed +0
-9
lines changed Expand file tree Collapse file tree 2 files changed +0
-9
lines changed Original file line number Diff line number Diff line change @@ -457,8 +457,6 @@ apply_stash () {
457
457
assert_stash_like " $@ "
458
458
459
459
git update-index -q --refresh || die " $( gettext " unable to refresh index" ) "
460
- git diff-index --cached --quiet --ignore-submodules HEAD -- ||
461
- die " $( gettext " Cannot apply stash: Your index contains uncommitted changes." ) "
462
460
463
461
# current index state
464
462
c_tree=$( git write-tree) ||
Original file line number Diff line number Diff line change @@ -45,13 +45,6 @@ test_expect_success 'applying bogus stash does nothing' '
45
45
test_cmp expect file
46
46
'
47
47
48
- test_expect_success ' apply requires a clean index' '
49
- test_when_finished "git reset --hard" &&
50
- echo changed >other-file &&
51
- git add other-file &&
52
- test_must_fail git stash apply
53
- '
54
-
55
48
test_expect_success ' apply does not need clean working directory' '
56
49
echo 4 >other-file &&
57
50
git stash apply &&
You can’t perform that action at this time.
0 commit comments