diff options
author | Victor Boivie <victor.boivie@sonyericsson.com> | 2010-11-26 13:42:13 +0100 |
---|---|---|
committer | Shawn O. Pearce <sop@google.com> | 2011-03-17 09:19:51 -0700 |
commit | 0960b5b53df6df7169c295de5509b0f705352d3b (patch) | |
tree | 3c0c8b10ec274b1c4621e626a06afdaa2ea390e9 | |
parent | fc06ced9f9b8b00841991b92a2a661302a69eb7b (diff) | |
download | git-repo-0960b5b53df6df7169c295de5509b0f705352d3b.tar.gz |
Creating rr-cachev1.7.4.1
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
-rw-r--r-- | project.py | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -1547,6 +1547,11 @@ class Project(object): | |||
1547 | cmd.append(HEAD) | 1547 | cmd.append(HEAD) |
1548 | if GitCommand(self, cmd).Wait() != 0: | 1548 | if GitCommand(self, cmd).Wait() != 0: |
1549 | raise GitError("cannot initialize work tree") | 1549 | raise GitError("cannot initialize work tree") |
1550 | |||
1551 | rr_cache = os.path.join(self.gitdir, 'rr-cache') | ||
1552 | if not os.path.exists(rr_cache): | ||
1553 | os.makedirs(rr_cache) | ||
1554 | |||
1550 | self._CopyFiles() | 1555 | self._CopyFiles() |
1551 | 1556 | ||
1552 | def _gitdir_path(self, path): | 1557 | def _gitdir_path(self, path): |