diff --git a/test/lint/git-subtree-check.sh b/test/lint/git-subtree-check.sh index 1eb83401f2c..534fadbad71 100755 --- a/test/lint/git-subtree-check.sh +++ b/test/lint/git-subtree-check.sh @@ -47,33 +47,33 @@ fi # Taken from git-subtree (Copyright (C) 2009 Avery Pennarun ) find_latest_squash() { - dir="$1" - sq= - main= - sub= - git log --grep="^git-subtree-dir: $dir/*\$" \ - --pretty=format:'START %H%n%s%n%n%b%nEND%n' "$COMMIT" | - while read a b _; do - case "$a" in - START) sq="$b" ;; - git-subtree-mainline:) main="$b" ;; - git-subtree-split:) sub="$b" ;; - END) - if [ -n "$sub" ]; then - if [ -n "$main" ]; then - # a rejoin commit? - # Pretend its sub was a squash. - sq="$sub" - fi - echo "$sq" "$sub" - break - fi - sq= - main= - sub= - ;; - esac - done + dir="$1" + sq= + main= + sub= + git log --grep="^git-subtree-dir: $dir/*\$" \ + --pretty=format:'START %H%n%s%n%n%b%nEND%n' "$COMMIT" | + while read a b _; do + case "$a" in + START) sq="$b" ;; + git-subtree-mainline:) main="$b" ;; + git-subtree-split:) sub="$b" ;; + END) + if [ -n "$sub" ]; then + if [ -n "$main" ]; then + # a rejoin commit? + # Pretend its sub was a squash. + sq="$sub" + fi + echo "$sq" "$sub" + break + fi + sq= + main= + sub= + ;; + esac + done } # find latest subtree update diff --git a/test/lint/test_runner/src/lint_text_format.rs b/test/lint/test_runner/src/lint_text_format.rs index 120e9a71db1..98e27d8ce10 100644 --- a/test/lint/test_runner/src/lint_text_format.rs +++ b/test/lint/test_runner/src/lint_text_format.rs @@ -21,7 +21,6 @@ fn get_pathspecs_exclude_whitespace() -> Vec { "src/qt/res/src/*.svg", "test/functional/test_framework/crypto/ellswift_decode_test_vectors.csv", "test/functional/test_framework/crypto/xswiftec_inv_test_vectors.csv", - "test/lint/git-subtree-check.sh", ] .iter() .map(|s| format!(":(exclude){s}")),