Spent half an hour searching the 7.x-1.x branch and wondering why the code does not match a 7.x dev tarball download. Please merge everything into 7.x-1.x and empty the master branch as recommended in http://drupal.org/node/1127732

Comments

grendzy’s picture

grendzy commented
Assigned: Unassigned » grendzy

I think making the switch should be OK. I've asked gordon for feedback.

jaypark’s picture

jaypark commented

what happened to the 7.x branch?

root@ubuntu:.../contrib.drupal.org/modules/securepages# git pull
Your configuration specifies to merge with the ref '7.x-1.x'
from the remote, but no such ref was fetched.

is last commit at master the most recent dev commit?

commit 47fff5d1ae192cc6996270512360ded74e5ed894
Author: Gordon Heydon
Date: Tue Nov 20 12:05:35 2012 +1100

If the form has set #https then stop secure pages from changing this.

jaypark’s picture

jaypark commented

root@ubuntu:.../contrib.drupal.org/modules/securepages# git branch -a
* master
remotes/origin/4.6.x-1.x
remotes/origin/4.7.x-1.x
remotes/origin/5.x-1.x
remotes/origin/6.x-1.x
remotes/origin/6.x-2.x
remotes/origin/HEAD -> origin/master
remotes/origin/master

astonvictor’s picture

astonvictor commented
Issue summary: View changes
Status: Active » Closed (outdated)

I'm closing it because the issue was created a long time ago without any further steps.

if you still need it then raise a new one.
thanks