[PATCH] dim: ignore rr-cache when checking for dirty drm-rerere branch

[Daniel Vetter]

Since we still have git gc fighting with our own gc algo it can happen
that git removes cached rerere entries before we decide to do. This is
mostly the case for unresolved conflicts (since there git deletes them
after 15 days already, while we keep them for 60 - the default only
for resolved conflicts).

To avoid confusion simply ignore this case. pull_rerere_cache should
clean up the mess if necessary.

Reported-by: Archit Taneja <architt at codeaurora.org>
Cc: Archit Taneja <architt at codeaurora.org>
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 097a1602cfbb..b3315905133c 100755
--- a/dim
+++ b/dim
@@ -631,7 +631,7 @@ function dim_rebuild_tip
 	rerere=$DIM_PREFIX/drm-rerere
 
 	cd $rerere
-	if git status --porcelain | grep -q -v "^[ ?][ ?]"; then
+	if git status --porcelain | grep -v "^.. rr-cache" | grep -q -v "^[ ?][ ?]"; then
 		warn_or_fail "integration configuration file $integration_config not commited"
 	fi
 
-- 
2.15.1