pull: take advantage of eval_gettextln
[gitweb.git] / t / t7501-commit.sh
index c2fd116d633351eeaa75cc4040f6e4a73670975b..3ad04363b5920497617f806a18a3a5a0083ac1b9 100755 (executable)
@@ -16,9 +16,10 @@ test_expect_success \
        "echo 'bongo bongo' >file &&
         git add file"
 
-test_expect_success C_LOCALE_OUTPUT \
-       "Constructing initial commit" \
-       "git status | grep 'Initial commit'"
+test_expect_success "Constructing initial commit" '
+       git status >actual &&
+       test_i18ngrep "Initial commit" actual
+'
 
 test_expect_success \
        "fail initial amend" \
@@ -133,6 +134,16 @@ test_expect_success PERL \
        "interactive add" \
        "echo 7 | git commit --interactive | grep 'What now'"
 
+test_expect_success PERL \
+       "commit --interactive doesn't change index if editor aborts" \
+       "echo zoo >file &&
+       test_must_fail git diff --exit-code >diff1 &&
+       (echo u ; echo '*' ; echo q) |
+       (EDITOR=: && export EDITOR &&
+        test_must_fail git commit --interactive) &&
+       git diff >diff2 &&
+       test_cmp diff1 diff2"
+
 test_expect_success \
        "showing committed revisions" \
        "git rev-list HEAD >current"