[Intel-gfx] [PATCH] dim: filter thisimage files

[Daniel Vetter]

They're just temporary files used by git. From rerere.c in the git
sources:

/*
 * Normalize the conflicts in path and write it out to
 * "thisimage" temporary file.
 */

Reported by Rodrigo.

v2: use find, not grep (Jani).

v3: Don't piss of shellcheck (Rodrigo).

Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
---
 dim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dim b/dim
index 11aa675cc3bc..940bc89104f7 100755
--- a/dim
+++ b/dim
@@ -545,7 +545,7 @@ function commit_rerere_cache
 				git rm $file &> /dev/null
 			fi
 		done
-		find rr-cache/ -mtime -1 -type f -print0 | xargs -0 git add > /dev/null
+		find rr-cache/ -mtime -1 -type f -not -name "thisimage*" -print0 | xargs -0 git add > /dev/null
 		git rm rr-cache/rr-cache &> /dev/null || true
 		if git commit -m "$time: $integration_branch rerere cache update" >& /dev/null; then
 			echo -n "New commit. "
-- 
2.14.1