diff options
Diffstat (limited to 'subcmds/sync.py')
-rw-r--r-- | subcmds/sync.py | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/subcmds/sync.py b/subcmds/sync.py index 934aaa80..2e9bbe70 100644 --- a/subcmds/sync.py +++ b/subcmds/sync.py | |||
@@ -194,9 +194,6 @@ later is required to fix a server side protocol bug. | |||
194 | help="overwrite an existing git directory if it needs to " | 194 | help="overwrite an existing git directory if it needs to " |
195 | "point to a different object directory. WARNING: this " | 195 | "point to a different object directory. WARNING: this " |
196 | "may cause loss of data") | 196 | "may cause loss of data") |
197 | p.add_option('--force-gitc', | ||
198 | dest='force_gitc', action='store_true', | ||
199 | help="actually sync sources in the gitc client directory.") | ||
200 | p.add_option('-l', '--local-only', | 197 | p.add_option('-l', '--local-only', |
201 | dest='local_only', action='store_true', | 198 | dest='local_only', action='store_true', |
202 | help="only update working tree, don't fetch") | 199 | help="only update working tree, don't fetch") |
@@ -539,16 +536,6 @@ later is required to fix a server side protocol bug. | |||
539 | print('error: both -u and -p must be given', file=sys.stderr) | 536 | print('error: both -u and -p must be given', file=sys.stderr) |
540 | sys.exit(1) | 537 | sys.exit(1) |
541 | 538 | ||
542 | cwd = os.getcwd() | ||
543 | if cwd.startswith(gitc_utils.GITC_MANIFEST_DIR) and not opt.force_gitc: | ||
544 | print('WARNING this will pull all the sources like a normal repo sync.\n' | ||
545 | '\nIf you want to update your GITC Client View please rerun this ' | ||
546 | 'command in \n%s%s.\nOr if you actually want to pull the sources, ' | ||
547 | 'rerun with --force-gitc.' % | ||
548 | (gitc_utils.GITC_FS_ROOT_DIR, | ||
549 | cwd.split(gitc_utils.GITC_MANIFEST_DIR)[1])) | ||
550 | sys.exit(1) | ||
551 | |||
552 | if opt.manifest_name: | 539 | if opt.manifest_name: |
553 | self.manifest.Override(opt.manifest_name) | 540 | self.manifest.Override(opt.manifest_name) |
554 | 541 | ||