brew update 失敗から復帰

% brew update
error: The following untracked working tree files would be overwritten by merge:
Library/Formula/ant.rb
Library/Formula/apple-gcc42.rb
Please move or remove them before you can merge.
Aborting
Error: Failure while executing: git pull -q origin refs/heads/master:refs/remotes/origin/master

みたいなことが起きたので対処。


http://qiita.com/dvorak__/items/4902a1ffd8eda32c6249

を参考に、

cd /usr/local/

へ移動します。

% git add .
% git stash
% git reset --hard

% brew update [/usr/local]
warning: unable to unlink Library/Homebrew/requirements/conflict_requirement.rb: Permission denied
warning: unable to unlink Library/Homebrew/superenv/macsystem.rb: Permission denied
error: unable to create symlink Library/ENV/pkgconfig/10.9 (Permission denied)
error: unable to unlink old 'Library/Homebrew/os/linux/hardware.rb' (Permission denied)
error: unable to create file Library/Homebrew/os/mac.rb (Permission denied)
error: unable to unlink old 'Library/Homebrew/os/mac/hardware.rb' (Permission denied)
error: unable to unlink old 'Library/Homebrew/os/mac/version.rb' (Permission denied)
error: unable to unlink old 'Library/Homebrew/os/mac/xcode.rb' (Permission denied)
error: unable to unlink old 'Library/Homebrew/os/mac/xquartz.rb' (Permission denied)
error: unable to create file Library/Homebrew/requirements/fortran_dependency.rb (Permission denied)
error: unable to unlink old 'Library/Homebrew/requirements/language_module_dependency.rb' (Permission denied)
error: unable to create file Library/Homebrew/requirements/ld64_dependency.rb (Permission denied)
error: unable to create file Library/Homebrew/requirements/minimum_macos_requirement.rb (Permission denied)
error: unable to unlink old 'Library/Homebrew/requirements/mpi_dependency.rb' (Permission denied)
error: unable to create file Library/Homebrew/requirements/python_dependency.rb (Permission denied)
Checking out files: 100% (1984/1984), done.
Error: Failure while executing: git pull -q origin refs/heads/master:refs/remotes/origin/master

うむむ、権限なしでうまくいかない。

% sudo chown -R `whoami` /usr/local

で権限をこのユーザに。

で、もう一度……、

% git stash [/usr/local]
Saved working directory and index state WIP on master: 8b48a62 sbcl 1.1.7
HEAD is now at 8b48a62 sbcl 1.1.7
% git reset --hard [/usr/local]
HEAD is now at 8b48a62 sbcl 1.1.7
% brew update [/usr/local]
error: The following untracked working tree files would be overwritten by merge:
Library/Aliases/git-tig
Library/Aliases/libtcnative
Library/Aliases/myrepos

== 省略 ==

Library/Formula/htmlcleaner.rb
Library/Formula/hubflow.rb
Library/Formula/influxdb.rb
Library/Formula/i
Aborting
Error: Failure while executing: git pull -q origin refs/heads/master:refs/remotes/origin/master

別のエラーでダメに。

次はこっち
http://stackoverflow.com/questions/14113427/brew-update-failed
を参考に、

% rm Library/Formula/argp-standalone.rb [/usr/local]
% rm Library/Formula/cocot.rb
% git fetch origin [/usr/local]
% git reset --hard origin/master [/usr/local]
Checking out files: 100% (1986/1986), done.
HEAD is now at b3e19af imagemagick: remove broken openmp option
% brew update [/usr/local]
Updated Homebrew from b3e19afe to b3e19afe.
==> New Formulae
homebrew/binary/cmucl homebrew/versions/llvm32
homebrew/binary/grads homebrew/versions/llvm33
homebrew/binary/jsl homebrew/versions/llvm34
homebrew/binary/kindlegen homebrew/versions/llvm35
homebrew/binary/lmutil homebrew/versions/log4cplus10
homebrew/binary/monoberry homebrew/versions/mariadb10
homebrew/versions/appledoc21 homebrew/versions/maven30
homebrew/versions/appledoc22 homebrew/versions/mpfr2
homebrew/versions/boost149 homebrew/versions/mysql55
homebrew/versions/cassandra12 homebrew/versions/open-mpi16
homebrew/versions/cloog-ppl015 homebrew/versions/percona-server55
homebrew/versions/cloog018 homebrew/versions/perl514
homebrew/versions/cvsps2 homebrew/versions/perl516
homebrew/versions/drush5 homebrew/versions/perl518
homebrew/versions/elasticsearch-0.20 homebrew/versions/plowshare3
homebrew/versions/gcc43 homebrew/versions/postgis20
homebrew/versions/gcc44 homebrew/versions/postgresql91
homebrew/versions/gcc46 homebrew/versions/postgresql92
homebrew/versions/gcc49 homebrew/versions/ppl011
homebrew/versions/giflib5 homebrew/versions/ppl10
homebrew/versions/glfw2 homebrew/versions/protobuf240a
homebrew/versions/glfw3 homebrew/versions/protobuf241
homebrew/versions/hadoop0202 homebrew/versions/ruby182
homebrew/versions/isl011 homebrew/versions/ruby186
homebrew/versions/jenkins-lts homebrew/versions/solr36
homebrew/versions/libcouchbase1 homebrew/versions/subversion17
homebrew/versions/libmpc08 homebrew/versions/valgrind36
homebrew/versions/libotr4 homebrew/versions/valgrind38
homebrew/versions/llvm31 homebrew/versions/vtk5
==> Updated Formulae
homebrew/binary/packer homebrew/versions/gcc45
homebrew/dupes/ab homebrew/versions/gcc47
homebrew/dupes/apr homebrew/versions/gcc48
homebrew/dupes/apr-util homebrew/versions/gmp4
homebrew/dupes/diffstat homebrew/versions/gstreamer010
homebrew/dupes/expect homebrew/versions/hdf4
homebrew/dupes/file-formula homebrew/versions/imagemagick-ruby186
homebrew/dupes/gdb homebrew/versions/libpng12
homebrew/dupes/grep homebrew/versions/llvm-gcc28
homebrew/dupes/groff homebrew/versions/lua52
homebrew/dupes/httpd homebrew/versions/maven2
homebrew/dupes/lapack homebrew/versions/mysql51
homebrew/dupes/less homebrew/versions/node08
homebrew/dupes/libpcap homebrew/versions/openssl098
homebrew/dupes/make homebrew/versions/play12
homebrew/dupes/ncurses homebrew/versions/postgis15
homebrew/dupes/openssh homebrew/versions/postgresql8
homebrew/dupes/rsync homebrew/versions/postgresql9
homebrew/dupes/tcl-tk homebrew/versions/python25
homebrew/dupes/tcpdump homebrew/versions/python26
homebrew/dupes/tidy homebrew/versions/python31
homebrew/dupes/unzip homebrew/versions/python32
homebrew/dupes/whois homebrew/versions/redis24
homebrew/dupes/zlib homebrew/versions/ruby192
homebrew/versions/allegro5 homebrew/versions/ruby193
homebrew/versions/automake112 homebrew/versions/scala29
homebrew/versions/bash-completion2 homebrew/versions/solr14
homebrew/versions/clojure14 homebrew/versions/squid2
homebrew/versions/drush4 homebrew/versions/subversion16
homebrew/versions/erlang-r13 homebrew/versions/tomcat6
homebrew/versions/erlang-r14 homebrew/versions/zeromq22
homebrew/versions/erlang-r15
==> Deleted Formulae
homebrew/dupes/ant homebrew/versions/erlang-r16
homebrew/dupes/perl

成功。