|
@@ -1306,7 +1306,7 @@ class Project(object):
|
|
|
not self._RemoteFetch(initial=is_new, quiet=quiet, alt_dir=alt_dir,
|
|
not self._RemoteFetch(initial=is_new, quiet=quiet, alt_dir=alt_dir,
|
|
|
current_branch_only=current_branch_only,
|
|
current_branch_only=current_branch_only,
|
|
|
no_tags=no_tags, prune=prune, depth=depth,
|
|
no_tags=no_tags, prune=prune, depth=depth,
|
|
|
- submodules=submodules)):
|
|
|
|
|
|
|
+ submodules=submodules, force_sync=force_sync)):
|
|
|
return False
|
|
return False
|
|
|
|
|
|
|
|
mp = self.manifest.manifestProject
|
|
mp = self.manifest.manifestProject
|
|
@@ -1955,7 +1955,8 @@ class Project(object):
|
|
|
no_tags=False,
|
|
no_tags=False,
|
|
|
prune=False,
|
|
prune=False,
|
|
|
depth=None,
|
|
depth=None,
|
|
|
- submodules=False):
|
|
|
|
|
|
|
+ submodules=False,
|
|
|
|
|
+ force_sync=False):
|
|
|
|
|
|
|
|
is_sha1 = False
|
|
is_sha1 = False
|
|
|
tag_name = None
|
|
tag_name = None
|
|
@@ -2068,6 +2069,9 @@ class Project(object):
|
|
|
else:
|
|
else:
|
|
|
cmd.append('--tags')
|
|
cmd.append('--tags')
|
|
|
|
|
|
|
|
|
|
+ if force_sync:
|
|
|
|
|
+ cmd.append('--force')
|
|
|
|
|
+
|
|
|
if prune:
|
|
if prune:
|
|
|
cmd.append('--prune')
|
|
cmd.append('--prune')
|
|
|
|
|
|