mirror of
				https://github.com/gfwlist/gfwlist.git
				synced 2025-11-04 00:27:39 +00:00 
			
		
		
		
	bug fix: won't commit others' updates to git repository if local list.txt not modified
This commit is contained in:
		
							parent
							
								
									9e9c82f0ab
								
							
						
					
					
						commit
						067c0f18e8
					
				@ -68,7 +68,7 @@ if [ "$convertedLog" != "" ]; then
 | 
				
			|||||||
  svn update &&
 | 
					  svn update &&
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  # save local modification
 | 
					  # save local modification
 | 
				
			||||||
  [ -n "$(git diff)" ] && git diff > temp.patch &&
 | 
					  [ -n "$(git diff)" ] && git diff > temp.patch; 
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  base64 -d gfwlist.txt > list.txt &&
 | 
					  base64 -d gfwlist.txt > list.txt &&
 | 
				
			||||||
  echo -e $convertedLog | git commit -a -F - ;
 | 
					  echo -e $convertedLog | git commit -a -F - ;
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user