IdP 3.1 branch version ?

[Ian Young]

> On 22 Jun 2015, at 17:48, Cantor, Scott <cantor.2 at osu.edu> wrote:
> 
>> What you're not necessarily obliged to do is push that branch anywhere. So
>> the closest equivalent to what we do today would be:
>> 
>> * make a local branch
>> * do the work for the release on that branch
>> * tag it (probably with a signed tag if the releaser has a GPG key)
>> * push the tag
> 
> That's where I get lost. Seems like the tag is hanging in mid-air with no clear path to get to it from what's in the repository. At minimum I would think anything showing the structure of the tree would get confused.

It works more straightforwardly than you might think. I checked out the testing repo and did this:

* back off three revs from master and make a new local branch:

   git checkout -b localbranch HEAD^3

* edit the file newfile.txt a couple of times:

   vi newfile.txt
   git add newfile.txt
   git commit -m "along the branch"
   vi newfile.txt
   git add newfile.txt
   git commit -m "more along the branch"

* Make a local annotated tag:

   git tag -a mytag -m "this is an annotated tag"

* push that tag to the server:

[iay at srv-c701 testing]$ git push origin mytag
Counting objects: 9, done.
Compressing objects: 100% (5/5), done.
Writing objects: 100% (7/7), 672 bytes | 0 bytes/s, done.
Total 7 (delta 0), reused 0 (delta 0)
To git at git.shibboleth.net:testing
 * [new tag]         mytag -> mytag

Note that it pushed several objects. If you now pull a clone of the testing repo and use gitk --all, you'll see the attached structure. You can see that you've acquired knowledge of the tag (but not my local branch, because I did not push that ref), the structure and all of the commits that can be reached by any of the public refs.

    -- Ian




-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://shibboleth.net/pipermail/dev/attachments/20150622/0e51aa59/attachment-0001.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: Screen Shot 2015-06-22 at 18.07.34.png
Type: image/png
Size: 18885 bytes
Desc: not available
URL: <http://shibboleth.net/pipermail/dev/attachments/20150622/0e51aa59/attachment-0001.png>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 5250 bytes
Desc: not available
URL: <http://shibboleth.net/pipermail/dev/attachments/20150622/0e51aa59/attachment-0001.p7s>