@matheusbsbs / matheus-bagliano / commits / 19376104a8

Revert "stash: require a clean index to apply"

This reverts commit ed178ef13a26136d86ff4e33bb7b1afb5033f908. That commit was an attempt to improve the safety of applying a stash, because the application process may create conflicted index entries, after which it is hard to restore the original index state. Unfortunately, this hurts some common workflows around "git stash -k", like: git add -p ;# (1) stage set of proposed changes git stash -k ;# (2) get rid of everything else make test ;# (3) make sure proposal is reasonable git stash apply ;# (4) restore original working tree If you "git commit" between steps (3) and (4), then this just works. However, if these steps are part of a pre-commit hook, you don't have that opportunity (you have to restore the original state regardless of whether the tests passed or failed). It's possible that we could provide better tools for this sort of workflow. In particular, even before ed178ef, it could fail with a conflict if there were conflicting hunks in the working tree and index (since the "stash -k" puts the index version into the working tree, and we then attempt to apply the differences between HEAD and the old working tree on top of that). But the fact remains that people have been using it happily for a while, and the safety provided by ed178ef is simply not that great. Let's revert it for now. In the long run, people can work on improving stash for this sort of workflow, but the safety tradeoff is not worth it in the meantime. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Jun 15, 2015 at 14:27 UTC 19376104a8251a7e6c56579cdcd2eb0a106d1fd6

2 files changed -9

git-stash.sh

-2

@@ -442,8 +442,6 @@ apply_stash () {

442 assert_stash_like "$@"

443

444 git update-index -q --refresh || die "$(gettext "unable to refresh index")"

445 - git diff-index --cached --quiet --ignore-submodules HEAD -- ||

446 - die "$(gettext "Cannot apply stash: Your index contains uncommitted changes.")"

445

446 # current index state

447 c_tree=$(git write-tree) ||

t/t3903-stash.sh

-7

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

45 test_cmp expect file

46 '

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 -

48 test_expect_success 'apply does not need clean working directory' '

49 echo 4 >other-file &&

50 git stash apply &&