Merge "_CheckDirReference: log actual error before suggesting --force-sync"

This commit is contained in:
Dan Willemsen 2016-10-28 06:49:07 +00:00 committed by Gerrit Code Review
commit e02c17c9ea

View File

@ -2400,6 +2400,7 @@ class Project(object):
src = os.path.realpath(os.path.join(srcdir, name)) src = os.path.realpath(os.path.join(srcdir, name))
# Fail if the links are pointing to the wrong place # Fail if the links are pointing to the wrong place
if src != dst: if src != dst:
_error('%s is different in %s vs %s', name, destdir, srcdir)
raise GitError('--force-sync not enabled; cannot overwrite a local ' raise GitError('--force-sync not enabled; cannot overwrite a local '
'work tree. If you\'re comfortable with the ' 'work tree. If you\'re comfortable with the '
'possibility of losing the work tree\'s git metadata,' 'possibility of losing the work tree\'s git metadata,'