From 24b60b0f71e0ffbd09c827230ecb5a37e833cade Mon Sep 17 00:00:00 2001 From: dundargoc <33953936+dundargoc@users.noreply.github.com> Date: Thu, 18 May 2023 16:28:46 +0200 Subject: [PATCH] build: don't format deleted files Trying to format deleted files will otherwise throw an error. --- cmake/Format.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/Format.cmake b/cmake/Format.cmake index 4115e66705..7e8ca3547d 100644 --- a/cmake/Format.cmake +++ b/cmake/Format.cmake @@ -15,21 +15,21 @@ function(get_changed_files outvar) # Changed files that have been committed execute_process( - COMMAND git diff --name-only ${ancestor_commit}...${current_branch} + COMMAND git diff --diff-filter=d --name-only ${ancestor_commit}...${current_branch} OUTPUT_VARIABLE committed_files OUTPUT_STRIP_TRAILING_WHITESPACE) separate_arguments(committed_files NATIVE_COMMAND ${committed_files}) # Unstaged files execute_process( - COMMAND git diff --name-only + COMMAND git diff --diff-filter=d --name-only OUTPUT_VARIABLE unstaged_files OUTPUT_STRIP_TRAILING_WHITESPACE) separate_arguments(unstaged_files NATIVE_COMMAND ${unstaged_files}) # Staged files execute_process( - COMMAND git diff --cached --name-only + COMMAND git diff --diff-filter=d --cached --name-only OUTPUT_VARIABLE staged_files OUTPUT_STRIP_TRAILING_WHITESPACE) separate_arguments(staged_files NATIVE_COMMAND ${staged_files})