The git repository for globalredirect (http://git.drupalcode.org/project/globalredirect.git) has both 7.x-1.x and master branches which have diverged.

Comments

This also makes the 7.x-1.x-dev download on the project page link to old code.

I assume the master branch is the equivilent of CVS HEAD or SVN Trunk? I'm still getting to grips with Git...

Is there anything "wrong" with Master being used for the Drupal 8 version (if we still need one by then) and using the 7.x-1.x branch for D7?

Oh It also looks like Dave Reid has committed several fixes to HEAD without realising there was a DRUPAL-7--1 branch... (http://drupal.org/project/cvs/88008)

Yes, master in git-land is HEAD in CVS. Sorry for using that lingo, but I'm trying as hard as possible to never have to actually learn CVS.

Anyway, the current state looks like

            7.x-1.x
             /
-- 7.x-1.3-alpha1 -- ... --- master

That in itself is fine, especially since, as you point out master could be interpreted as the 8.x-dev branch. However, the commit logs on that branch indicate they are for Drupal 7. It's only a problem in that the 7.x-1.x-dev Development Downloads (on http://drupal.org/project/globalredirect) are getting made from the 7.x-1.x branch which is over 6 months old and missing several bug-fixes and improvements on the master branch.

Title:7.x-1.x and master branches confusingDevelopment releases link to wrong branch
Priority:Minor» Major

Retitling. The 7.x-1.x development download releases (from http://drupal.org/project/globalredirect) are getting linked to the 7.x-1.x branch. But all of the action in terms of fixing the module up for release is on HEAD.

This is creating confusion in the issue queue (see, for example #995088: Install failure which is really a duplicate of #861994: Call to undefined function _globalredirect_get_settings() which was fixed last October in the HEAD branch).

Here are two patches, one to clean up 7.x-1.x branch and one to clean up master branch. Pick one.

See #861994: Call to undefined function _globalredirect_get_settings()

Status:Active» Needs review

Thank you very much pillarsdotnet. I applied, committed, and pushed the 7.x-1.x branch patch as that's the current one we should be using, not master.

Status:Needs review» Fixed

Status:Fixed» Closed (fixed)

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