On Tue, Dec 18, 2018 at 11:30:12AM +0100, Andrzej Hajda wrote:
> Hi all,
>
> This small patchset fixes issues with dim and git worktree's.
> In v2 I have:
> - removed incorrect rr_cache_dir fix patch,
> - added patch fixing update_rerere_cache,
> - added patch converting git_dir function to
Assumption that git directory is always located at REPO/.git is incorrect,
especially in case of git worktrees. There is already function to deal
with it correctly - git_dir, let's then use it.
Signed-off-by: Andrzej Hajda
Reviewed-by: Daniel Vetter
---
dim | 13 -
1 file changed,
Using rev-parse git option is safer than manually parsing git files.
Signed-off-by: Andrzej Hajda
---
dim | 8 +---
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/dim b/dim
index e4a4afe..e999409 100755
--- a/dim
+++ b/dim
@@ -556,13 +556,7 @@ function check_conflicts # tree
Hi all,
This small patchset fixes issues with dim and git worktree's.
In v2 I have:
- removed incorrect rr_cache_dir fix patch,
- added patch fixing update_rerere_cache,
- added patch converting git_dir function to use git rev_parse,
- added R-Bs (thanks Daniel).
Regards
Andrzej
Andrzej
git_dir function returns git directory for current working directory.
Allowing specifying any directory allows to reuse it more widely.
Signed-off-by: Andrzej Hajda
Reviewed-by: Daniel Vetter
---
dim | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/dim b/dim
index
update_rerere_cache does not work correctly if drm-tip and $DIM_REPO are
workdirs - it cannot locate properly rr-cache. Let's use git rev-parse
to resolve rr-cache location.
Signed-off-by: Andrzej Hajda
---
dim | 25 -
1 file changed, 12 insertions(+), 13 deletions(-)