W3C home > Mailing lists > Public > public-webauthn@w3.org > October 2016

branch acz in funny state ?

From: Hodges, Jeff <jeff.hodges@paypal.com>
Date: Wed, 12 Oct 2016 16:50:02 +0000
To: W3C WebAuthn WG <public-webauthn@w3.org>
Message-ID: <D423B7C9.D8497%jehodges@paypalcorp.com>
AFAICT I have not made any local commits to branch acz in my local clone of the webauthn spec repo, however, upon updating my clone this is what I'm seeing...


> git remote update

Fetching origin

remote: Counting objects: 118, done.

remote: Compressing objects: 100% (117/117), done.

remote: Total 118 (delta 26), reused 0 (delta 0), pack-reused 0

Receiving objects: 100% (118/118), 1.78 MiB | 1.56 MiB/s, done.

Resolving deltas: 100% (26/26), done.

>From https://github.com/w3c/webauthn

 + cb039c9...103a5b7 acz        -> origin/acz  (forced update)

// why "forced update" ?


> git status

On branch acz

Your branch and 'origin/acz' have diverged,

and have 1 and 2 different commits each, respectively.

  (use "git pull" to merge the remote branch into yours)


// huh?


> git hist | head -30

* cb039c9 2016-10-01 | Adding u2f appid extension (HEAD, acz) [Alexei Czeskis]

* 1eebeed 2016-09-29 | Clarify usage of transport hints (#225) (origin/master, origin/HEAD) [Alexei Czeskis]

* 5438a06 2016-09-29 | Try out moving to latest copy of bikeshed to avoid git checkout error (#228) (master) [Vijay Bharadwaj]

* a0a9b0c 2016-09-28 | Use RP macro in more places (#224) [Alexei Czeskis]

* 8bc1dae 2016-09-28 | Clean up blank spaces [J.C. Jones]

*   b47b2e8 2016-09-28 | Merge pull request #193 from gmandyam/master [=JeffH]

|\

| * 9e7c75b 2016-09-28 | Update draft-hodges-webauthn-registries.xml [gmandyam]


// Looks fine to me -- do I just do "git pull" in this branch and cross my fingers?

thx

=JeffH

ps: I note in https://github.com/w3c/webauthn/pull/229/files that apparently there's a bikeshed update included in the branch? is that's what is causing the above inconsistencies?
Received on Wednesday, 12 October 2016 16:50:32 UTC

This archive was generated by hypermail 2.4.0 : Tuesday, 5 July 2022 07:26:23 UTC