diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-03-03 07:59:50 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-03 07:59:50 (GMT) |
| commit | 6b48990354b6380665565f21c3f89d2f7109c459 (patch) | |
| tree | c3eefde8d65ef12c7af7a68ba045cc55f98cd2b8 /t | |
| parent | 34cd62eb91600109378c8121c1fecd924a9af177 (diff) | |
| parent | d3df4271b900c9bf529cf495afeb77fbbf621221 (diff) | |
| download | git-6b48990354b6380665565f21c3f89d2f7109c459.zip git-6b48990354b6380665565f21c3f89d2f7109c459.tar.gz git-6b48990354b6380665565f21c3f89d2f7109c459.tar.bz2 | |
Merge branch 'maint'
* maint:
Update draft release notes for 1.5.4.4
revert: actually check for a dirty index
tests: introduce test_must_fail
git-submodule: Fix typo 'url' which should be '$url'
receive-pack: Initialize PATH to include exec-dir.
Conflicts:
builtin-revert.c
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3501-revert-cherry-pick.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh index 2dbe04f..6da2128 100755 --- a/t/t3501-revert-cherry-pick.sh +++ b/t/t3501-revert-cherry-pick.sh @@ -59,4 +59,13 @@ test_expect_success 'revert after renaming branch' ' ' +test_expect_success 'revert forbidden on dirty working tree' ' + + echo content >extra_file && + git add extra_file && + test_must_fail git revert HEAD 2>errors && + grep "Dirty index" errors + +' + test_done |