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

Re: branch acz in funny state ?

From: Hodges, Jeff <jeff.hodges@paypal.com>
Date: Thu, 13 Oct 2016 23:09:14 +0000
To: W3C WebAuthn WG <public-webauthn@w3.org>
Message-ID: <D425601C.D8986%jehodges@paypalcorp.com>
On 10/12/16, 9:50 AM, "Hodges, Jeff" <jeff.hodges@paypal.com> wrote:
>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?

fyi/fwiw, what I ended up doing according to the 2nd answer here..

<http://stackoverflow.com/questions/19864934/git-your-branch-and-origin-mas
ter-have-diverged-how-to-throw-away-local-com>

..is saving the apparantly-horked acz branch to acz-temp, then doing..

  git reset --hard origin/acz

..in the acz branch, which made git happy and my copy of acz branch
apparently match the remote repo's copy.

quick inspection in acz-temp via..

  git diff acz-temp acz

..shows a bunch of differences between them in the .spec-data directory
and who knows what else...I wonder how it (my copy of the acz branch) got
messed up. 

=JeffH
Received on Thursday, 13 October 2016 23:09:44 UTC

This archive was generated by hypermail 2.4.0 : Thursday, 24 March 2022 20:38:18 UTC