admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

git-etc: add removed files too.

Browse Source
This commit is contained in:
Mike McQuaid 2013-09-09 16:15:17 +01:00
parent 20ed26c655
commit 3a0204dd0b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/formula_installer.rb
View File

@ -78,7 +78,7 @@ class FormulaInstaller
etc.cd do etc.cd do
quiet_system 'git', 'init' unless (etc+'.git').directory? quiet_system 'git', 'init' unless (etc+'.git').directory?
quiet_system 'git', 'checkout', '-B', "#{f.name}-last" quiet_system 'git', 'checkout', '-B', "#{f.name}-last"
system 'git', 'add', '.' system 'git', 'add', '--all', '.'
system 'git', 'commit', '-m', "#{f.name}-#{f.version}: preinstall" system 'git', 'commit', '-m', "#{f.name}-#{f.version}: preinstall"
end end
end end
@ -94,14 +94,14 @@ class FormulaInstaller
etc.cd do etc.cd do
FileUtils.cp_r keg_etc_files, etc FileUtils.cp_r keg_etc_files, etc
system 'git', 'add', '.' system 'git', 'add', '--all', '.'
if quiet_system 'git', 'diff', '--exit-code', default_branch if quiet_system 'git', 'diff', '--exit-code', default_branch
quiet_system 'git', 'reset', '--hard' quiet_system 'git', 'reset', '--hard'
else else
if quiet_system 'git', 'rev-parse', 'master' if quiet_system 'git', 'rev-parse', 'master'
quiet_system 'git', 'checkout', '-f', 'master' quiet_system 'git', 'checkout', '-f', 'master'
FileUtils.cp_r keg_etc_files, etc FileUtils.cp_r keg_etc_files, etc
quiet_system 'git', 'add', '.' quiet_system 'git', 'add', '--all', '.'
else else
quiet_system 'git', 'checkout', '-b' 'master' quiet_system 'git', 'checkout', '-b' 'master'
end end