Project

General

Profile

« Previous | Next » 

Revision 6b1437ca

Added by Scott Ullrich over 16 years ago

Correctly checkout branches

View differences:

etc/phpshellsessions/cvssync
101 101 
	exec("cd $CODIR/mainline && git fetch");
102 102 
} else {
103 103 
	exec("cd $CODIR && git clone $GIT_REPO");
104 
	exec("cd $CODIR/mainline && git fetch && git checkout -b $BRANCHTAG origin/$BRANCHTAG");
104 
	exec("cd $CODIR/mainline && git fetch");
105 105 
}
106 106 

  		




  107
  
  
    
if($branch == "master")


  		




  
  107
  
    
if($branch == "master") {


  		




  108
  108
  
    
	exec("cd $CODIR/mainline && git checkout master");


  		




  109
  
  
    
else 


  		




  110
  
  
    
	exec("cd $CODIR/mainline && git checkout $BRANCHTAG");


  		




  
  109
  
    
} else {


  		




  
  110
  
    
	$current_branch=`git branch | grep $BRANCHTAG`


  		




  
  111
  
    
	if($current_branch == "") 


  		




  
  112
  
    
		exec("cd $CODIR/mainline && git fetch && git checkout -b $BRANCHTAG origin/$BRANCHTAG");		


  		




  
  113
  
    
	else


  		




  
  114
  
    
		exec("cd $CODIR/mainline && git checkout $BRANCHTAG");


  		




  
  115
  
    
}


  		




  111
  116
  
    

  		




  112
  117
  
    
exec("mkdir -p /tmp/lighttpd/cache/compress/");


  		




  113
  118
  
    

  		












Also available in:  Unified diff