undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/stash-loosen-safety' into maint

Browse Source 
* jk/stash-loosen-safety:
  stash: drop dirty worktree check on apply
This commit is contained in:
Junio C Hamano 2011-05-04 14:57:15 -07:00
commit 0752000c2a
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-stash.sh
View File

@ -344,9 +344,7 @@ apply_stash () {
assert_stash_like "$@"
git update-index -q --refresh &&
git diff-files --quiet --ignore-submodules ||
die 'Cannot apply to a dirty working tree, please stage your changes'
git update-index -q --refresh || die 'unable to refresh index'
# current index state
c_tree=$(git write-tree) ||

20
t/t3903-stash.sh
View File

@ -37,14 +37,26 @@ test_expect_success 'parents of stash' '
test_cmp output expect
'
test_expect_success 'apply needs clean working directory' '
echo 4 > other-file &&
test_expect_success 'apply does not need clean working directory' '
echo 4 >other-file &&
git add other-file &&
echo 5 > other-file &&
test_must_fail git stash apply
echo 5 >other-file &&
git stash apply &&
echo 3 >expect &&
test_cmp expect file
'
test_expect_success 'apply does not clobber working directory changes' '
git reset --hard &&
echo 4 >file &&
test_must_fail git stash apply &&
echo 4 >expect &&
test_cmp expect file
'
test_expect_success 'apply stashed changes' '
git reset --hard &&
echo 5 >other-file &&
git add other-file &&
test_tick &&
git commit -m other-file &&