diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-08 00:36:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-08 00:36:00 -0800 |
| commit | 919451330b55366ac207e575c1982bc8fa5220ed (patch) | |
| tree | 5b11a7fb5c80483a5e29532ce42e72dd77f1d6e5 /t | |
| parent | 493e433277ee72b200e72f7a17e08266ed9497c5 (diff) | |
| parent | e1327ed5fbaca0af44db89d60c33b641e2f21ee1 (diff) | |
| download | git-919451330b55366ac207e575c1982bc8fa5220ed.tar.gz git-919451330b55366ac207e575c1982bc8fa5220ed.tar.xz | |
Merge branch 'jk/maint-add--interactive-delete' into maint
* jk/maint-add--interactive-delete:
add-interactive: fix bogus diff header line ordering
Diffstat (limited to 't')
| -rwxr-xr-x | t/t2016-checkout-patch.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t2016-checkout-patch.sh b/t/t2016-checkout-patch.sh index 4d1c2e9e0..2144184d7 100755 --- a/t/t2016-checkout-patch.sh +++ b/t/t2016-checkout-patch.sh @@ -66,6 +66,14 @@ test_expect_success 'git checkout -p HEAD^' ' verify_state dir/foo parent parent ' +test_expect_success 'git checkout -p handles deletion' ' + set_state dir/foo work index && + rm dir/foo && + (echo n; echo y) | git checkout -p && + verify_saved_state bar && + verify_state dir/foo index index +' + # The idea in the rest is that bar sorts first, so we always say 'y' # first and if the path limiter fails it'll apply to bar instead of # dir/foo. There's always an extra 'n' to reject edits to dir/foo in |