Make --no-tags work with -c

Currently, the --no-tags option is ignored if the user asks to only
fetch the current branch. There is no reason for this restriction. Fix
it.

Change-Id: Ibaaeae85ebe9955ed49325940461d630d794b990
Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org>
This commit is contained in:
Mitchel Humpherys 2014-03-10 14:21:59 -07:00 committed by David Pursehouse
parent 68425f4da8
commit 26c45a7958

View File

@ -1763,8 +1763,6 @@ class Project(object):
cmd.append('--update-head-ok') cmd.append('--update-head-ok')
cmd.append(name) cmd.append(name)
if not current_branch_only:
# Fetch whole repo
# If using depth then we should not get all the tags since they may # If using depth then we should not get all the tags since they may
# be outside of the depth. # be outside of the depth.
if no_tags or depth: if no_tags or depth:
@ -1772,6 +1770,8 @@ class Project(object):
else: else:
cmd.append('--tags') cmd.append('--tags')
if not current_branch_only:
# Fetch whole repo
cmd.append(str((u'+refs/heads/*:') + remote.ToLocal('refs/heads/*'))) cmd.append(str((u'+refs/heads/*:') + remote.ToLocal('refs/heads/*')))
elif tag_name is not None: elif tag_name is not None:
cmd.append('tag') cmd.append('tag')