rr_cache_dir function cannot assume REPO/.git is a directory. On the other
side it should be backward compatible - if rr-cache directory/link already
exists it should be returned.
Signed-off-by: Andrzej Hajda <a.hajda@xxxxxxxxxxx>
---
Hi,
I am not sure of the purpose of rr-cache symbolic link, dim does not use
it (except its creation/removal). So this patch should be verified by
someone who knows better what is going on here.
Regards
Andrzej
---
dim | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/dim b/dim
index 3afa8b6..b72ebfd 100755
--- a/dim
+++ b/dim
@@ -554,15 +554,6 @@ function check_conflicts # tree
true
}
-function rr_cache_dir
-{
- if [ -d $DIM_PREFIX/drm-tip/.git/ ] ; then
- echo $DIM_PREFIX/drm-tip/.git/rr-cache
- else
- echo $DIM_PREFIX/$DIM_REPO/.git/rr-cache
- fi
-}
-
function git_dir
{
local dir=${1:-$PWD}
@@ -574,6 +565,17 @@ function git_dir
fi
}
+function rr_cache_dir
+{
+ local dir=$(git_dir $DIM_PREFIX/$DIM_REPO)/rr-cache
+
+ if [ -d $dir ]; then
+ echo $dir
+ else
+ echo $(git_dir $DIM_PREFIX/drm-tip)/rr-cache
+ fi
+}
+
function pull_rerere_cache
{
cd $DIM_PREFIX/drm-rerere/
--
2.17.1
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
