diff options
Diffstat (limited to 'project.py')
-rw-r--r-- | project.py | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -2820,7 +2820,8 @@ class Project(object): | |||
2820 | } | 2820 | } |
2821 | # Paths that we know will be in both, but are safe to clobber in .repo/projects/. | 2821 | # Paths that we know will be in both, but are safe to clobber in .repo/projects/. |
2822 | SAFE_TO_CLOBBER = { | 2822 | SAFE_TO_CLOBBER = { |
2823 | 'COMMIT_EDITMSG', 'FETCH_HEAD', 'HEAD', 'gitk.cache', 'index', 'ORIG_HEAD', | 2823 | 'COMMIT_EDITMSG', 'FETCH_HEAD', 'HEAD', 'gc.log', 'gitk.cache', 'index', |
2824 | 'ORIG_HEAD', | ||
2824 | } | 2825 | } |
2825 | 2826 | ||
2826 | # First see if we'd succeed before starting the migration. | 2827 | # First see if we'd succeed before starting the migration. |