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

Rodrigo Vivi rodrigo.vivi at intel.com
Tue Jan 9 21:23:11 UTC 2018


I think I got this case here already... somehow...
so I had to git reset hard head on rerere and start over.

if pull rerere cache solves this in a cleaner way and it is called on
both update and commit times I think we are safe

Acked-by: Rodrigo Vivi <rodrigo.vivi at intel.com>

On Tue, Jan 09, 2018 at 02:15:29PM +0000, Daniel Vetter wrote:
> 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
> 
> _______________________________________________
> dim-tools mailing list
> dim-tools at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dim-tools


More information about the dim-tools mailing list