Backup.
This commit is contained in:
		
						commit
						f51e928d87
					
				
							
								
								
									
										3
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								Makefile
									
									
									
									
									
								
							| 
						 | 
				
			
			@ -36,4 +36,5 @@ clean:
 | 
			
		|||
	external/libconfig/libconfig-1.7.3 \
 | 
			
		||||
	external/goahead-5.2.0/GoAhead \
 | 
			
		||||
	output_files \
 | 
			
		||||
	cmake-shell
 | 
			
		||||
	cmake-shell
 | 
			
		||||
	@git checkout output_files
 | 
			
		||||
| 
						 | 
				
			
			@ -55,7 +55,7 @@ set(CLANG_FORMAT_FILE "LLVM ${CMAKE_SOURCE_DIR_IPCSDK}/tools/clang-format/.clang
 | 
			
		|||
if(${LINUX_TEST} MATCHES "true")
 | 
			
		||||
    set(CLANG_TIDY_SUPPORT                     "true")
 | 
			
		||||
    set(CLANG_FORMAT_SUPPORT                   "true")
 | 
			
		||||
    set(COMPILE_IMPROVE_SUPPORT                "true") # 开启后每次编译可能会很慢
 | 
			
		||||
    set(COMPILE_IMPROVE_SUPPORT                "false") # 开启后每次编译可能会很慢
 | 
			
		||||
    set(LLVM_PATH                              "$ENV{HOME}/llvm-project")
 | 
			
		||||
endif()
 | 
			
		||||
# ------------ build clang-tools end ------------ #
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										20
									
								
								merge.sh
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										20
									
								
								merge.sh
									
									
									
									
									
										Executable file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,20 @@
 | 
			
		|||
#!/bin/bash
 | 
			
		||||
 | 
			
		||||
# 获取所有由我们删除的文件列表
 | 
			
		||||
deleted_files=$(git status --short | grep '^DU' | awk '{print $2}')
 | 
			
		||||
 | 
			
		||||
# 检查是否找到了任何文件
 | 
			
		||||
if [[ -z "$deleted_files" ]]; then
 | 
			
		||||
    echo "没有找到由我们删除的文件。"
 | 
			
		||||
    exit 0
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
# 遍历文件列表并忽略它们
 | 
			
		||||
for file in $deleted_files; do
 | 
			
		||||
    echo "忽略文件: $file"
 | 
			
		||||
    git rm --cached "$file"
 | 
			
		||||
done
 | 
			
		||||
 | 
			
		||||
# 提示用户提交更改
 | 
			
		||||
echo "已忽略所有由我们删除的文件。"
 | 
			
		||||
echo "你可以使用 'git commit' 来提交这些更改。"
 | 
			
		||||
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
		Loading…
	
		Reference in New Issue
	
	Block a user