问题:
编译代码生成一些编译文件,不需要加入到版本控制中
[root@centos-xtao xtao-test-build-fix]# git status
# On branch master
# Your branch is ahead of 'origin/master' by 4 commits.
# (use "git push" to publish your local commits)
#
# Changes not staged for commit:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
# modified: conf/compile/rpm_config_common.yml
# modified: libs/__init__.pyc
# modified: libs/common/__init__.pyc
# modified: libs/common/cmd/__init__.pyc
# modified: libs/common/cmd/shell_cmd_exe.pyc
# modified: libs/common/get/__init__.pyc
# modified: libs/common/get/get_file_list.pyc
# modified: libs/common/get/get_rpm_info.pyc
# modified: libs/common/get/list_file.pyc
# modified: libs/common/git/__init__.pyc
# modified: libs/common/git/refresh_code.pyc
# modified: libs/common/git/sync_to_git.pyc
# modified: libs/common/yum_source.pyc
# modified: libs/compile/__init__.pyc
# modified: libs/compile/common/__init__.pyc
# modified: libs/compile/common/rpm_config_get_set.py
# modified: libs/compile/common/rpm_config_get_set.pyc
# modified: libs/compile/common/whl_config_get_set.pyc
# modified: libs/compile/rpm/__init__.pyc
# modified: libs/compile/rpm/compile_check.pyc
# modified: libs/compile/rpm/copy_to_ext.pyc
# modified: libs/compile/rpm/copy_to_pkg.pyc
# modified: libs/compile/rpm/init.pyc
# modified: libs/compile/rpm/main.py
# modified: libs/compile/rpm/pre_compile.pyc
# modified: libs/compile/whl/__init__.pyc
# modified: libs/compile/whl/init.pyc
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# .gitignore
# libs/compile/rpm/.copy_to_ext.py.swn
# libs/compile/rpm/.copy_to_ext.py.swo
# libs/compile/rpm/.copy_to_ext.py.swp
# scripts/achelous_compile_target.sh
# scripts/ceph-12.2.11_compile_target.sh
no changes added to commit (use "git add" and/or "git commit -a")
解决:
1. 添加.gitignore文件
1.1 在repo目录下创建.gitignore文件
cd /mnt/user/qinqin/scripts/xtao-test-build-fix
touch .gitignore
1.2 写入需要忽略的文件
#ignore this file
*.pyc
*.swn
*.swo
*.swp
1.3 这个是一个全局的忽略,需要执行一下命令生效
git config --global core.excludesfile ~/.gitignore
1.4 可以看到需要忽略的文件在git status中看不到了
[root@centos-xtao xtao-test-build-fix]# git status
# On branch master
# Your branch is ahead of 'origin/master' by 4 commits.
# (use "git push" to publish your local commits)
#
# Changes not staged for commit:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
# modified: conf/compile/rpm_config_common.yml
# modified: libs/__init__.pyc
# modified: libs/common/__init__.pyc
# modified: libs/common/cmd/__init__.pyc
# modified: libs/common/cmd/shell_cmd_exe.pyc
# modified: libs/common/get/__init__.pyc
# modified: libs/common/get/get_file_list.pyc
# modified: libs/common/get/get_rpm_info.pyc
# modified: libs/common/get/list_file.pyc
# modified: libs/common/git/__init__.pyc
# modified: libs/common/git/refresh_code.pyc
# modified: libs/common/git/sync_to_git.pyc
# modified: libs/common/yum_source.pyc
# modified: libs/compile/__init__.pyc
# modified: libs/compile/common/__init__.pyc
# modified: libs/compile/common/rpm_config_get_set.py
# modified: libs/compile/common/rpm_config_get_set.pyc
# modified: libs/compile/common/whl_config_get_set.pyc
# modified: libs/compile/rpm/__init__.pyc
# modified: libs/compile/rpm/compile_check.pyc
# modified: libs/compile/rpm/copy_to_ext.pyc
# modified: libs/compile/rpm/copy_to_pkg.pyc
# modified: libs/compile/rpm/init.pyc
# modified: libs/compile/rpm/main.py
# modified: libs/compile/rpm/pre_compile.pyc
# modified: libs/compile/whl/__init__.pyc
# modified: libs/compile/whl/init.pyc
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# .gitignore
# scripts/achelous_compile_target.sh
# scripts/ceph-12.2.11_compile_target.sh
no changes added to commit (use "git add" and/or "git commit -a")
1.5.1 但是已经在版本库中的是没办法的,只能删除了
find . -name "*.swo" | xargs rm -rf
find . -name "*.swp" | xargs rm -rf
find . -name "*.swn" | xargs rm -rf
find . -name "*.pyc" | xargs rm -rf
[root@centos-xtao xtao-test-build-fix]# git status
# On branch master
# Your branch is ahead of 'origin/master' by 4 commits.
# (use "git push" to publish your local commits)
#
# Changes not staged for commit:
# (use "git add/rm <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
# modified: conf/compile/rpm_config_common.yml
# deleted: libs/__init__.pyc
# deleted: libs/common/__init__.pyc
# deleted: libs/common/cmd/__init__.pyc
# deleted: libs/common/cmd/shell_cmd_exe.pyc
# deleted: libs/common/get/__init__.pyc
# deleted: libs/common/get/get_file_list.pyc
# deleted: libs/common/get/get_rpm_info.pyc
# deleted: libs/common/get/list_file.pyc
# deleted: libs/common/git/__init__.pyc
# deleted: libs/common/git/refresh_code.pyc
# deleted: libs/common/git/sync_to_git.pyc
# deleted: libs/common/yum_source.pyc
# deleted: libs/compile/__init__.pyc
# deleted: libs/compile/common/__init__.pyc
# modified: libs/compile/common/rpm_config_get_set.py
# deleted: libs/compile/common/rpm_config_get_set.pyc
# deleted: libs/compile/common/whl_config_get_set.pyc
# deleted: libs/compile/rpm/__init__.pyc
# deleted: libs/compile/rpm/compile_check.pyc
# deleted: libs/compile/rpm/copy_to_ext.pyc
# deleted: libs/compile/rpm/copy_to_pkg.pyc
# deleted: libs/compile/rpm/init.pyc
# modified: libs/compile/rpm/main.py
# deleted: libs/compile/rpm/pre_compile.pyc
# deleted: libs/compile/whl/__init__.pyc
# deleted: libs/compile/whl/init.pyc
# deleted: libs/docker/base/.get_all_depended_info.py.swp
# deleted: libs/git/.git_branch.py.swp
# deleted: scripts/.spl-0.6.5.6_compile_target.sh.swp
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# .gitignore
# scripts/achelous_compile_target.sh
# scripts/ceph-12.2.11_compile_target.sh
no changes added to commit (use "git add" and/or "git commit -a")
1.5.2 若是已经commit,再加入gitignore是无效的,所以需要删除下缓存
git rm -r --cached ignore_file
2.1 还有1种方式是在repo中添加要忽略的文件路径
git update-index --assume-unchanged PATH 在PATH处输入要忽略的文件
3. 若是不想在公共的全局中进行忽略,仅自己本地进行忽略(因为 .gitignore 这个文件本身会提交到版本库中去),选择以下方式
.git/info/exclude 这里设置的则是你自己本地需要排除的文件。 他不会影响到其他人。也不会提交到版本库中去
4 忽视跟踪后,恢复跟踪
4.1 git add
git add -f
4.2 .gitignore
在.gitignore中删除对应文件就行
4.3 git update-index --assume-unchanged
git update-index --no-assume-unchanged PATH 来解除
附: