diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-11-29 17:52:34 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-29 17:52:34 -0800 |
| commit | 5eee142c89ee4964c9ea4ae1b2fa8344036a7efb (patch) | |
| tree | 2d114ae692ac53034a4353e80f44e62598ed1d9a /t | |
| parent | d7f4809bc5ceaef14420be57aecbdf8280fac81c (diff) | |
| parent | f6ce1f25885f3db71935b201c5e3c858eb993f5c (diff) | |
| download | git-5eee142c89ee4964c9ea4ae1b2fa8344036a7efb.tar.gz | |
Merge branch 'jn/cherry-pick-refresh-index'
* jn/cherry-pick-refresh-index:
cherry-pick/revert: transparently refresh index
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3501-revert-cherry-pick.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh index bc7aedd048..043954422c 100755 --- a/t/t3501-revert-cherry-pick.sh +++ b/t/t3501-revert-cherry-pick.sh @@ -81,6 +81,16 @@ test_expect_success 'revert after renaming branch' ' ' +test_expect_success 'cherry-pick on stat-dirty working tree' ' + git clone . copy && + ( + cd copy && + git checkout initial && + test-chmtime +40 oops && + git cherry-pick added + ) +' + test_expect_success 'revert forbidden on dirty working tree' ' echo content >extra_file && |