Merge pull request ocaml#10656 from dra27/check-typo-fixes

Two minor fixes to check-typo
mmottl · Sep 27, 2021 · aa8100a · aa8100a
2 parents 8da8b7e + 8d3c2e0
commit aa8100a
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/tools/check-typo b/tools/check-typo
@@ -112,6 +112,10 @@ case "$1" in
           echo "INFO: pruned path $2 (.git)" >&2
           exit 0;;
     esac
+    if git check-ignore -q "$2"; then
+        echo "INFO: pruned path $2 (.gitignore)" >&2
+        exit 0
+    fi
     if test -n "$(check_prune "$2")"; then
         echo "INFO: pruned path $2 (typo.prune)" >&2
         exit 0
@@ -198,6 +202,7 @@ EXIT_CODE=0
       *$f*) is_cmd_line=true;;
       *) is_cmd_line=false;;
     esac
+    if $path_in_index || $is_cmd_line; then :; else continue; fi
     if [ -z "$OCAML_CT_PREFIX" ] ; then
       if [ -x "$f" ] ; then
         check_script "$f"
@@ -207,7 +212,6 @@ EXIT_CODE=0
         check_script "$f"
       fi
     fi
-    if $path_in_index || $is_cmd_line; then :; else continue; fi
     attr_rules=''
     if $path_in_index; then
       # Below is a git plumbing command to detect whether git regards a