Dealing with conflicting tags - multiple remotes

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi,

Take a repo with multiple remotes. These remotes each have a specific branch/tag naming convention, and there are tags in each that conflict with those in other remotes. In order to avoid conflicts, it seems possible to add something like this to the '.git/config' file:

    [remote "origin"]
        url = git@xxxxxxxxxx:schacon/simplegit-progit.git
        fetch = +refs/heads/*:refs/remotes/origin/*
        fetch = +refs/tags/*:refs/tags/origin/*

This is discussed here:

    http://stackoverflow.com/a/5496610
    http://git-scm.com/book/en/Git-Internals-The-Refspec

However, when you try to pull in these tags, you'll see two different sets of tags - one with the prefix ('origin' above) and one without. Why is this? Is this a bug, or by design?

If this is not the recommended approach to avoid conflicts, could someone suggest a better one?

Regards,
Stephen Finucane

PS: system info -
 * Fedora 20 64-bit (3.15.7-200.fc20.x86_64)
 * git version 1.9.3

--------------------------------------------------------------
Intel Shannon Limited
Registered in Ireland
Registered Office: Collinstown Industrial Park, Leixlip, County Kildare
Registered Number: 308263
Business address: Dromore House, East Park, Shannon, Co. Clare

This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.


--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]