Merge branch 'jn/gitweb-js-blame' into next

diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh
index 3d2b14d3035e02e14696f64edd0ddabca204f576..3ad04363b5920497617f806a18a3a5a0083ac1b9 100755 (executable)
--- a/t/t7501-commit.sh
+++ b/t/t7501-commit.sh
@@ -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" \
@@ -41,11 +42,12 @@ test_expect_success \
        "echo King of the bongo >file &&
        test_must_fail git commit -m foo -a file"
 
-test_expect_success PERL 'cannot use paths with --interactive' '
+test_expect_success PERL 'can use paths with --interactive' '
        echo bong-o-bong >file &&
        # 2: update, 1:st path, that is all, 7: quit
        ( echo 2; echo 1; echo; echo 7 ) |
-       test_must_fail git commit -m foo --interactive file
+       git commit -m foo --interactive file &&
+       git reset --hard HEAD^
 '
 
 test_expect_success \
@@ -132,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"