aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-03-02 23:59:50 -0800
committerJunio C Hamano <gitster@pobox.com>2008-03-02 23:59:50 -0800
commit6b48990354b6380665565f21c3f89d2f7109c459 (patch)
treec3eefde8d65ef12c7af7a68ba045cc55f98cd2b8 /t
parent34cd62eb91600109378c8121c1fecd924a9af177 (diff)
parentd3df4271b900c9bf529cf495afeb77fbbf621221 (diff)
downloadgit-6b48990354b6380665565f21c3f89d2f7109c459.tar.gz
git-6b48990354b6380665565f21c3f89d2f7109c459.tar.xz
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-xt/t3501-revert-cherry-pick.sh9
1 files changed, 9 insertions, 0 deletions
diff --git a/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh
index 2dbe04fb2..6da212825 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