[PATCH/RFC] fetch: allow command line --tags to override config
- From
Daniel Johnson <computerdruid@gmail.com>
- Date
- Aug 4, 2010, 18:56 UTC
- Message-ID
- <1280948202-17385-1-git-send-email-ComputerDruid@gmail.com>
Originally, if remote.<name>.tagopt was set, the --tags and option would have no effect when given to git fetch. So if tagopt="--no-tags"
git fetch --tags
would not actually fetch tags.
This patch changes this behavior to only follow what is written in the config if there is no option passed by the command line.
Signed-off-by: Daniel Johnson <ComputerDruid@gmail.com> --- builtin/fetch.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/builtin/fetch.c b/builtin/fetch.c index 1b67f5f..7a53144 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -675,10 +675,12 @@ static int do_fetch(struct transport *transport, for_each_ref(add_existing, &existing_refs); - if (transport->remote->fetch_tags == 2 && tags != TAGS_UNSET) - tags = TAGS_SET; - if (transport->remote->fetch_tags == -1) - tags = TAGS_UNSET; + if (tags == TAGS_DEFAULT) { + if (transport->remote->fetch_tags == 2) + tags = TAGS_SET; + if (transport->remote->fetch_tags == -1) + tags = TAGS_UNSET; + } if (!transport->get_refs_list || !transport->fetch) die("Don't know how to fetch from %s", transport->url);
-- 1.7.2