From 0960b5b53df6df7169c295de5509b0f705352d3b Mon Sep 17 00:00:00 2001 From: Victor Boivie Date: Fri, 26 Nov 2010 13:42:13 +0100 Subject: [PATCH] Creating rr-cache If git-rerere is enabled, it uses the rr-cache directory that repo currently creates a symlink from, but doesn't create the destination directory (inside the project's directory). Git will then complain during merges and rebases. This commit creates the rr-cache directory inside the project. Change-Id: If8b57a04f022fc6ed6a7007d05aa2e876e6611ee --- project.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/project.py b/project.py index 49633f7f..4cef856b 100644 --- a/project.py +++ b/project.py @@ -1547,6 +1547,11 @@ class Project(object): cmd.append(HEAD) if GitCommand(self, cmd).Wait() != 0: raise GitError("cannot initialize work tree") + + rr_cache = os.path.join(self.gitdir, 'rr-cache') + if not os.path.exists(rr_cache): + os.makedirs(rr_cache) + self._CopyFiles() def _gitdir_path(self, path):