Patch is coming. You should remove the master branch.

CommentFileSizeAuthor
#1 2111099-1-pareview.patch24.79 KBkscheirer
Support from Acquia helps fund testing for Drupal Acquia logo

Comments

kscheirer’s picture

Status: Active » Needs review
FileSize
24.79 KB

Patch attached.

Manuel Garcia’s picture

Thanks kscheirer!

+++ b/views-view-accordion.tpl.php
@@ -16,8 +16,8 @@
diff --git a/views_accordion.info b/views_accordion.info

diff --git a/views_accordion.info b/views_accordion.info
index 9f45ae8..6ad37ab 100644

index 9f45ae8..6ad37ab 100644
--- a/views_accordion.info

--- a/views_accordion.info
+++ b/views_accordion.info

+++ b/views_accordion.info
+++ b/views_accordion.info
@@ -4,5 +4,4 @@ package = Views

@@ -4,5 +4,4 @@ package = Views
 core = 7.x
 dependencies[] = views
 
-files[] = views_accordion.views.inc

Why remove views_accordion.views.inc from files[] ¿?
I see the plugin stil works so views picks it up automatically, stil just wondering why remove it...

Manuel Garcia’s picture

Humm I tried deleting the master branch as you suggested (not used anyway), but the change got rejected somehow... not sure why it says that By default, deleting the current branch is denied, since i had checked out to 7.x before deleting the branch...

manuel@la-bestia:~/htdocs/drupal7/sites/all/modules/views_accordion$ git checkout master
Branch master set up to track remote branch master from origin.
Switched to a new branch 'master'
manuel@la-bestia:~/htdocs/drupal7/sites/all/modules/views_accordion$ git checkout 7.x-1.x
Switched to branch '7.x-1.x'
manuel@la-bestia:~/htdocs/drupal7/sites/all/modules/views_accordion$ git branch -D master
Deleted branch master (was e49e62e).
manuel@la-bestia:~/htdocs/drupal7/sites/all/modules/views_accordion$ git push origin :master
remote: error:<strong> By default, deleting the current branch is denied</strong>, because the next
remote: error: 'git clone' won't result in any file checked out, causing confusion.
remote: error: 
remote: error: You can set 'receive.denyDeleteCurrent' configuration variable to
remote: error: 'warn' or 'ignore' in the remote repository to allow deleting the
remote: error: current branch, with or without a warning message.
remote: error: 
remote: error: To squelch this message, you can set it to 'refuse'.
remote: error: refusing to delete the current branch: refs/heads/master
To manuelgarcia@git.drupal.org:project/views_accordion.git
 ! [remote rejected] master (deletion of the current branch prohibited)
error: failed to push some refs to 'manuelgarcia@git.drupal.org:project/views_accordion.git'
kscheirer’s picture

Hmm, that is weird. It doesn't hurt to leave it of course. I'll do some research and see if I can find anything for you.

As for the .info file, technically the files[] directive is for "code files containing class or interface declarations." See https://drupal.org/node/542202#files. Not a big deal of course, just general cleanup :)

kscheirer’s picture

Manuel Garcia’s picture

Status: Needs review » Closed (fixed)

Thanks kscheirer for the clarification, committed to 7.x-1.x with attribution.

As for the master branch, very weird, none of the dev are using the master branch, but when i try pushing the deleted branch back to origin i get the above message "By default, deleting the current branch is denied".

So I decided to just empty the master branch and leave a README.txt file clarifying that it's not used.

kscheirer’s picture

Works for me, thanks!