builtin/commit.c: extract ignore_non_trailer() helper function

diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index 04385a7250fa0f5c68a469ef72b68953aafb78d7..27263dfb80420a417bb0f33aa8731ef2fb7bc7b6 100755 (executable)
--- a/t/t9300-fast-import.sh
+++ b/t/t9300-fast-import.sh
@@ -12,7 +12,7 @@ test_description='test git fast-import utility'
 # This could be written as "head -c $1", but IRIX "head" does not
 # support the -c option.
 head_c () {
-       "$PERL_PATH" -e '
+       perl -e '
                my $len = $ARGV[1];
                while ($len > 0) {
                        my $s;
@@ -1050,7 +1050,7 @@ cat >expect <<EOF
 :100755 100755 e74b7d465e52746be2b4bae983670711e6e66657 e74b7d465e52746be2b4bae983670711e6e66657 R100  newdir/exec.sh  sub/newdir/exec.sh
 :100644 100644 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 R100  newdir/interesting      sub/newdir/interesting
 EOF
-test_expect_failure \
+test_expect_success \
        'M: rename root to subdirectory' \
        'git fast-import <input &&
         git diff-tree -M -r M4^ M4 >actual &&
@@ -2864,14 +2864,14 @@ test_expect_success 'S: notemodify with garbage after sha1 dataref must fail' '
 '
 
 #
-# notemodify, mark in committish
+# notemodify, mark in commit-ish
 #
-test_expect_success 'S: notemodify with garbarge after mark committish must fail' '
+test_expect_success 'S: notemodify with garbarge after mark commit-ish must fail' '
        test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
        commit refs/heads/Snotes
        committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
        data <<COMMIT
-       commit S note committish
+       commit S note commit-ish
        COMMIT
        N :202 :302x
        EOF