sigh... I just noticed there are a bunch of commits hanging off the master branch that have never been shipped in any release.

It seems to me those are proper patches that should be shipped with the module. I think it would be necessary to merge those in and make a new beta before going forward with any debugging (e.g. #831162: cannot login on stackoverflow or dotnetopenid sites) or the D7 port (#983128: Drupal 7 port of OpenID Provider).

Comments

anarcat’s picture

anarcat CreditAttribution: anarcat commented
Status: Active » Needs work

Those are the commits that need to be reviewed/tested:

* d7e3a20 - (origin/master, master) Removing translation directories (11 months ago)
* e7f40c4 - Stripping CVS keywords (11 months ago)
* 5f9739f - #510372 by anarcat: Added Brazilian Portuguese translation. (1 year, 11 months ago)
* e24cc46 - pot file (1 year, 11 months ago)
* e7b6a6e - #441028 by alex_b | anarcat: List OpenID Provider in OpenID package. (1 year, 11 months ago)
* 5f692c3 - #396508 by anarcat, Aron Novak | Gábor Hojtsy, walkah: Changed Make user/N/openid-sites themable and default to table display. (1 year, 11 months ago)
* c673bd9 - #506062 by Aron Novak: Adds unsolicited assertion support. (1 year, 11 months ago)
* 3764b62 - #311760 by sanduhrs | anarcat: Page: OpenID sites, tabs jumping. (1 year, 11 months ago)
* 3860ce7 - #311085 by sanduhrs: Coding standards update. (with minor cleanups to apply patch cleanly) (1 year, 11 months ago)
* 114f1c0 - #396468 by alex_b, Aron Novak | anarcat: Fixed Don't use underscores in URLs. (1 year, 11 months ago)
* 4a48643 - #394114 by Aron Novak | anarcat: Changed Association expire, explain it at the UI. (1 year, 11 months ago)
* 02e6e05 - #394986 by alex_b, Gábor Hojtsy | anarcat: Changed Improve readme. (1 year, 11 months ago)
* 1d534c7 - minor fix for php5.3 compat (1 year, 11 months ago)
* a1111b0 - sync head with d6 (1 year, 11 months ago)
* 0f45442 - #621956 by alex_b | xqus: Fixed Redirecting fails when not logged in on the provider site. (2 years, 1 month ago)

anarcat’s picture

anarcat CreditAttribution: anarcat commented
Status: Needs work » Needs review

I have merged the master branch into 6.x, and it looks like there is no significant change.

If somebody could test the dev snapshot, it would be a good time (when it's generated of course, so say tomorrow).

anarcat’s picture

anarcat CreditAttribution: anarcat commented
Status: Needs review » Fixed

the branch was merged, it's a null diff with the previous release, so no problem here:

anarcat@marcos:openid_provider$ git diff 6.x-1.0-beta4 --stat
anarcat@marcos:openid_provider$ git diff origin/master --stat
 openid_provider.inc       |  106 ++++++++++++++++++++++++++++++++-------------
 openid_provider.install   |   11 ++++-
 openid_provider.module    |   99 ++++++++++++++++++++++++++----------------
 openid_provider.pages.inc |   13 +++---
 openid_provider.test      |   97 +++++++++++++++++++++++++++++++++++++++++
 5 files changed, 250 insertions(+), 76 deletions(-)

Now we have to get rid of that master branch, see #1418254: please delete the master branch on the openid_provider module.

damien_vancouver’s picture

damien_vancouver CreditAttribution: damien_vancouver commented

Hi anacrat,

I don't think you can get rid of master, it's there as a branch in all Drupal projects.

What I've seen done elsewhere and how it works if you make a new project (ie. since the git migration) is that master is just empty.

So now the merge is done, you could delete all the files from it with "git rm" and then leave a README.txt behind saying to check out a branch instead. I just did this for XRDS Simple, if you want to check out the commit:

http://drupalcode.org/project/xrds_simple.git/commit/698c2e2

my commands for that were:

git checkout master  # switch to master branch
git rm xrds_simple.api.php xrds_simple.module   # get rid of old code files
git status  
vi xrds_simple.info   # edited the .info file and removed the core =  line so it's just name and description
vi README.txt  # added a README saying to look into 6.x-1.x or 7.x-1.x branches for the code
git add README.txt xrds_simple.info  
git commit   
git status
git push origin master   # push this back to master, which is now empty..the code is in the two branches.
anarcat’s picture

anarcat CreditAttribution: anarcat commented

Indeed, this is a good workaround. I went simple:

git rm -r *
echo 'Use the topical branches 6.x or 7.x.' > README.txt
git add README.txt
git commit -m"remove the master branch"

I still think the branch should be removed, if possible, but at least now things are clear.

Status: Fixed » Closed (fixed)

Automatically closed -- issue fixed for 2 weeks with no activity.