mirror of
				https://github.com/whyour/qinglong.git
				synced 2025-11-04 11:16:07 +08:00 
			
		
		
		
	修复拉取仓库重置操作
This commit is contained in:
		
							parent
							
								
									97f128d59f
								
							
						
					
					
						commit
						67bc305950
					
				| 
						 | 
					@ -330,8 +330,8 @@ git_pull_scripts() {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  set_proxy "$proxy"
 | 
					  set_proxy "$proxy"
 | 
				
			||||||
  git fetch --all
 | 
					  git fetch --all
 | 
				
			||||||
 | 
					  git pull 1>/dev/null
 | 
				
			||||||
  exit_status=$?
 | 
					  exit_status=$?
 | 
				
			||||||
  git pull &>/dev/null
 | 
					 | 
				
			||||||
  unset_proxy
 | 
					  unset_proxy
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  cd $dir_current
 | 
					  cd $dir_current
 | 
				
			||||||
| 
						 | 
					@ -357,7 +357,7 @@ reset_romote_url() {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
reset_branch() {
 | 
					reset_branch() {
 | 
				
			||||||
  local branch="$1"
 | 
					  local branch="$1"
 | 
				
			||||||
  local part_cmd=""
 | 
					  local part_cmd="HEAD"
 | 
				
			||||||
  if [[ $branch ]]; then
 | 
					  if [[ $branch ]]; then
 | 
				
			||||||
    part_cmd="origin/${branch}"
 | 
					    part_cmd="origin/${branch}"
 | 
				
			||||||
    git checkout -B "$branch" &>/dev/null
 | 
					    git checkout -B "$branch" &>/dev/null
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue
	
	Block a user