diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2016-10-28 06:49:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-10-28 06:49:07 +0000 |
| commit | e02c17c9eadb7cf591853f97f8780861379ea05f (patch) | |
| tree | 2a0f2d51cf12d12153ef98864bc1028e106d9d37 /project.py | |
| parent | 6e310790334b2cd7f7ba72cf3dbd3585176ccbdf (diff) | |
| parent | ec287902e6517f0f7d11738f411d111c1ed06df1 (diff) | |
| download | git-repo-e02c17c9eadb7cf591853f97f8780861379ea05f.tar.gz | |
Merge "_CheckDirReference: log actual error before suggesting --force-sync"
Diffstat (limited to 'project.py')
| -rw-r--r-- | project.py | 1 |
1 files changed, 1 insertions, 0 deletions
| @@ -2400,6 +2400,7 @@ class Project(object): | |||
| 2400 | src = os.path.realpath(os.path.join(srcdir, name)) | 2400 | src = os.path.realpath(os.path.join(srcdir, name)) |
| 2401 | # Fail if the links are pointing to the wrong place | 2401 | # Fail if the links are pointing to the wrong place |
| 2402 | if src != dst: | 2402 | if src != dst: |
| 2403 | _error('%s is different in %s vs %s', name, destdir, srcdir) | ||
| 2403 | raise GitError('--force-sync not enabled; cannot overwrite a local ' | 2404 | raise GitError('--force-sync not enabled; cannot overwrite a local ' |
| 2404 | 'work tree. If you\'re comfortable with the ' | 2405 | 'work tree. If you\'re comfortable with the ' |
| 2405 | 'possibility of losing the work tree\'s git metadata,' | 2406 | 'possibility of losing the work tree\'s git metadata,' |