From dcbf7bf61a9d8ccb6e0edc6607d985a36989cc27 Mon Sep 17 00:00:00 2001
From: Kevin Wilfong <kevinwilfong@fb.com>
Date: Mon, 10 Jun 2024 17:23:29 -0700
Subject: [PATCH] [Velox] Fix some gaps in clang format

---
 .clang-format          | 1 +
 scripts/check.py       | 2 +-
 scripts/setup-check.sh | 5 +++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.clang-format b/.clang-format
index eab4576fe09a5..a9a562eca5d26 100644
--- a/.clang-format
+++ b/.clang-format
@@ -54,6 +54,7 @@ IncludeCategories:
 IndentCaseLabels: true
 IndentWidth:     2
 IndentWrappedFunctionNames: false
+InsertNewlineAtEOF: true
 KeepEmptyLinesAtTheStartOfBlocks: false
 MacroBlockBegin: ''
 MacroBlockEnd:   ''
diff --git a/scripts/check.py b/scripts/check.py
index 87512747db391..a0051c7bbdcdf 100755
--- a/scripts/check.py
+++ b/scripts/check.py
@@ -185,7 +185,7 @@ def get_files(commit, path):
 
     if commit != "":
         status, stdout, stderr = util.run(
-            f"git diff --relative --name-only --diff-filter='ACM' {commit}"
+            f"git diff --relative --name-only --diff-filter='ACMR' {commit}"
         )
         filelist = stdout.splitlines()
     else:
diff --git a/scripts/setup-check.sh b/scripts/setup-check.sh
index a9fa3947ad322..f8bb67549311f 100644
--- a/scripts/setup-check.sh
+++ b/scripts/setup-check.sh
@@ -18,9 +18,10 @@ set -x
 
 export DEBIAN_FRONTEND=noninteractive
 apt update
-apt install --no-install-recommends -y clang-format-12 python3-pip git make ssh
+apt list clang-format
+apt install --no-install-recommends -y clang-format-13 python3-pip git make ssh
 pip3 install cmake==3.28.3 cmake_format black regex
 pip3 cache purge
 apt purge --auto-remove -y python3-pip
-update-alternatives --install /usr/bin/clang-format clang-format "$(command -v clang-format-12)" 12
+update-alternatives --install /usr/bin/clang-format clang-format "$(command -v clang-format-13)" 13
 apt clean