brew update で error: The following untracked working tree files would be overwritten by merge:
/usr/local/Library配下だという事を、忘れそうなので記録。
表示通り、該当ファイルを move or remove
[zunermuka ~]$ brew update
error: The following untracked working tree files would be overwritten by merge:
Library/Formula/libarchive.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
[zunermuka ~]$ mv /usr/local/Library/Formula/libarchive.rb /usr/local/Library/Formula/libarchive.rb.`date +%Y%m%d%H%M%S`
nrhd（使ってみたかっただけ）
[zunermuka ~]$ brew update -v
git checkout -q master
==> git rev-parse -q --verify HEAD
1c82a6a184f7aff224dbc98ed88f358e48c4d2cc
git config core.autocrlf false
git pull origin refs/heads/master:refs/remotes/origin/master
Updating 1c82a6a..7185491
Fast-forward
Library/ENV/4.3/cc | 23 ++-
Library/Formula/arangodb.rb | 10 +-
Library/Formula/bigloo.rb | 39 ----
Library/Formula/easy-tag.rb | 2 +-
Library/Formula/elixir.rb | 1 +
Library/Formula/fop.rb | 34 +---
Library/Formula/gmp.rb | 7 +
Library/Formula/go.rb | 6 +-
Library/Formula/hbase.rb | 4 +-
Library/Formula/httrack.rb | 5 +-
Library/Formula/ios-webkit-debug-proxy.rb | 4 +-
Library/Formula/jetty.rb | 6 +-
Library/Formula/lame.rb | 3 +-
Library/Formula/libarchive.rb | 18 ++
Library/Formula/libgpg-error.rb | 2 +-
Library/Formula/libksba.rb | 1 +
Library/Formula/libogg.rb | 4 +
Library/Formula/libslax.rb | 4 +-
Library/Formula/libvorbis.rb | 4 +
Library/Formula/macvim.rb | 2 +-
Library/Formula/mu.rb | 1 +
Library/Formula/mysql-connector-odbc.rb | 1 +
Library/Formula/open-ocd.rb | 13 +-
Library/Formula/pixman.rb | 4 +-
Library/Formula/pv.rb | 4 +-
Library/Formula/qt.rb | 4 +-
Library/Formula/rdup.rb | 19 +-
Library/Formula/rpm.rb | 67 +++++++
Library/Formula/shocco.rb | 1 +
Library/Formula/signing-party.rb | 1 +
Library/Formula/sleuthkit.rb | 9 +
Library/Formula/solr.rb | 4 +-
Library/Formula/spdylay.rb | 2 +-
Library/Formula/squid.rb | 13 +-
Library/Formula/vert.x.rb | 2 +-
Library/Formula/vim.rb | 4 +-
Library/Formula/xctool.rb | 4 +-
Library/Formula/youtube-dl.rb | 4 +-
Library/Homebrew/cmd/deps.rb | 4 +-
Library/Homebrew/cmd/doctor.rb | 2 +-
Library/Homebrew/cmd/info.rb | 15 +-
Library/Homebrew/compat.rb | 7 +
Library/Homebrew/compat/compatibility.rb | 216 ---------------------
Library/Homebrew/compat/env.rb | 13 ++
Library/Homebrew/compat/fails_with_llvm.rb | 17 ++
Library/Homebrew/compat/formula.rb | 29 +++
.../compat/{hardware_compat.rb => hardware.rb} | 0
Library/Homebrew/compat/macos.rb | 56 ++++++
Library/Homebrew/compat/md5.rb | 23 +++
Library/Homebrew/compat/version.rb | 6 +
Library/Homebrew/dependable.rb | 4 +
Library/Homebrew/dependencies.rb | 20 ++
Library/Homebrew/dependency.rb | 42 ++--
Library/Homebrew/extend/ENV.rb | 2 +-
Library/Homebrew/formula.rb | 2 +-
Library/Homebrew/global.rb | 5 +-
Library/Homebrew/hardware.rb | 2 -
Library/Homebrew/macos.rb | 12 ++
Library/Homebrew/requirement.rb | 12 ++
Library/Homebrew/requirements.rb | 3 +
Library/Homebrew/requirements/mpi_dependency.rb | 2 +
Library/Homebrew/superenv.rb | 12 +-
Library/Homebrew/test/test_dependencies.rb | 14 ++
Library/Homebrew/test/test_dependency_expansion.rb | 61 ++++++
Library/Homebrew/test/testing_env.rb | 5 +-
65 files changed, 517 insertions(+), 405 deletions(-)
delete mode 100644 Library/Formula/bigloo.rb
create mode 100644 Library/Formula/libarchive.rb
create mode 100644 Library/Formula/rpm.rb
create mode 100644 Library/Homebrew/compat.rb
delete mode 100644 Library/Homebrew/compat/compatibility.rb
create mode 100644 Library/Homebrew/compat/env.rb
create mode 100644 Library/Homebrew/compat/fails_with_llvm.rb
create mode 100644 Library/Homebrew/compat/formula.rb
rename Library/Homebrew/compat/{hardware_compat.rb => hardware.rb} (100%)
create mode 100644 Library/Homebrew/compat/macos.rb
create mode 100644 Library/Homebrew/compat/md5.rb
create mode 100644 Library/Homebrew/compat/version.rb
create mode 100644 Library/Homebrew/test/test_dependency_expansion.rb
==> git rev-parse -q --verify HEAD
7185491097119c5e55910edebaa3aa7b0066799f
==> git diff-tree -r --raw -M85% 1c82a6a184f7aff224dbc98ed88f358e48c4d2cc 7185491097119c5e55910edebaa3aa7b0066799f
:100755 100755 85f57817dfb35264d947ce0b8d51c465d4ec16f4 3d6241c1fd2d4bf208c08afbf0100e7d142e8c22 M Library/ENV/4.3/cc
:100644 100644 26faf86cbc1ab49fba2a9e1587a7a13019827df5 2bc958ff0d3f83a73670992eac3c98cd8ecf7d5e M Library/Formula/arangodb.rb
:100644 000000 328d57fd4aed95f5e927694da58e28b9362f5693 0000000000000000000000000000000000000000 D Library/Formula/bigloo.rb
:100644 100644 db9fc4ca42b8c3192c1819f0a1b4bd8e782db219 64d889768ca5b3eb81281562104932869b63d989 M Library/Formula/easy-tag.rb
:100644 100644 74b133d9120ca5abed92ef80a65715392a65276a c129bac148e5d983ef2db2bb45e734b66afe9204 M Library/Formula/elixir.rb
:100644 100644 6a6ac13f0a01f89e08bc981191b9d817fe0d5965 6fb22946550f3948099d5965d462fb577b9d294c M Library/Formula/fop.rb
:100644 100644 d74a7804a258d6e8ebee44006e29d911502bacf6 f12a268c15929b04c198be7a0cffdb8a28f4dd89 M Library/Formula/gmp.rb
:100644 100644 d944830a57adab982c5976fba5e6559eb0e06e8e e30487a995a665d0bc7f976b058c2f15b0d48728 M Library/Formula/go.rb
:100644 100644 5df0254305742d66332a6f59c67ad955fcfd9aca 1d4ca28bc931233f8218d2b0c93537b22a79fdbb M Library/Formula/hbase.rb
:100644 100644 e487b761e6428d3562539a5c8e6283792d636a30 8fa52e24205e80a7440c934a87f73173da0e6ce9 M Library/Formula/httrack.rb
:100644 100644 d36ad950f5b13896f59287b0d7e4a74b91bb94f9 cfc1352b7de1ab3d36c03a60bd0b28ef7abc6b15 M Library/Formula/ios-webkit-debug-proxy.rb
:100644 100644 157327c1135c11c8c065f611b63bf49a4082d87d c3d22bccacdbab50f5a8a9cf75007160921ee670 M Library/Formula/jetty.rb
:100644 100644 c0533eccca35e97cbd39d468d0323dad3429e106 851a46cfbaa2952068ebd60ea5c696c4687a5791 M Library/Formula/lame.rb
:000000 100644 0000000000000000000000000000000000000000 d4613921da768b7fc404db8ddb57fcf9899061f7 A Library/Formula/libarchive.rb
:100644 100644 df5aee07bae878f8f2c0327bfd05f1154428f20d 5eef49177c77c43207eae5cff9bb492c5454a0e4 M Library/Formula/libgpg-error.rb
:100644 100644 b343e7842445639c6af0ed6606f294f63b428ec7 c352a1e0d74b81d9b0bae05793d0c4457b04848c M Library/Formula/libksba.rb
:100644 100644 276417685ac92dd699bf394edf3759bf8185869c 82d23376e662c59e63be0e9e0a906bdb39c17944 M Library/Formula/libogg.rb
:100644 100644 fd6840e4095edc6af7df6cfad7ada15a6c807ff6 39546063d8c21baf684f1a9a001cabe0bcfba41a M Library/Formula/libslax.rb
:100644 100644 d38c0ca4dda6bfa3668bf81c59af50d591abcdaf 835a0c30f96faceba368a2d67d5fb61d36cfc2f6 M Library/Formula/libvorbis.rb
:100644 100644 21bf41a3ac1a511ee47533642610a07a5428de65 2ab7ee02a3fcbc1db664e9d56393c6f4dfecc06a M Library/Formula/macvim.rb
:100644 100644 9b50c5ea3c5f95c86571b36c91c579a452c4c14c 2d9d18f9a532ecaed1780f0e9ca4004197af29c0 M Library/Formula/mu.rb
:100644 100644 06a7ed6d9b54958c734b55876df4f046fa1d8da6 6bbbe3a7cb8c5cdf0636f04d9ba49b35fb8fdfc6 M Library/Formula/mysql-connector-odbc.rb
:100644 100644 494e0fa12cbf2067bd15df63faf5c6bdbd01def4 4ba68b4e7323aea0461a33b62a52b80f1ecafcf6 M Library/Formula/open-ocd.rb
:100644 100644 6d5b89dd0fb3e895e0e7312a338b14c084bc7ab2 cf189e2ec16bd3d3882036385e3d783b237d93e3 M Library/Formula/pixman.rb
:100644 100644 ee1e3ad37f6def5f27099c1030aec1d11fa9a66a 5d98833634b39780feeea0e3f6e1b7b19cd9f78d M Library/Formula/pv.rb
:100644 100644 e592c25b37ad2a897457a1adbda8f9a2d47135ee 8d0dd3b9e32229a55817e6212fbbcdeece77938e M Library/Formula/qt.rb
:100644 100644 90b7da226b3ab29c6e2bbb441fe6fe9e506ca8fe 060ba370aaed4b690a3d5843447700bf8858ddce M Library/Formula/rdup.rb
:000000 100644 0000000000000000000000000000000000000000 6eba3dd508b5681370166b35d83495603415449f A Library/Formula/rpm.rb
:100644 100644 bd69595179584f01bcf708d23e87051df752d3fb c30df7b24b5026df5f3af6e68ffd28b04829fc2b M Library/Formula/shocco.rb
:100644 100644 dfa02fae57e6171b2524e3b17cc65a9cd735193c ecbb8c6b71bd21534a02faa4d37189b29c31749a M Library/Formula/signing-party.rb
:100644 100644 3b0f266c2f4c5fb00fa58246238a9c06f5e54eb3 035edc84725121a99036167f168ad393ceb9bc97 M Library/Formula/sleuthkit.rb
:100644 100644 e668b773af4eff2548e099ed22a82aab8893aa64 37be133ab9c2fd041c82f745f7cbb95d395d314d M Library/Formula/solr.rb
:100644 100644 3ddfb6848a1c0e810d0ddbaef6213f818b9614c4 8602fd1ac8199d4a14e1adafc3874352a199f5e0 M Library/Formula/spdylay.rb
:100644 100644 ceae2bedb9492c239dafc57640cef2f1de85ebad 16692dd2c0204620676bdbf7e945651aa5179a07 M Library/Formula/squid.rb
:100644 100644 017e34162afcc942e23d7d8f8cfd95108b3a1af8 cdb3a85c6fbc30415344deb17cfc319e64d37aac M Library/Formula/vert.x.rb
:100644 100644 a84cda7ef97ec1df350dbbaad2f481b686a99c4e c74b41d804a2016edd180a7070f75b46f6cfa37e M Library/Formula/vim.rb
:100644 100644 ce6c6d20082512de8e3afeeb8a9106f473aea91f bf1781aec802244a7245ee488f01b5b58ad5a305 M Library/Formula/xctool.rb
:100644 100644 7485ae0759cd350fa3696915f6c7d6ee205cab8c 1fa100b6c4beb252605dc7a911168fa711adc267 M Library/Formula/youtube-dl.rb
:100644 100644 eb819ef541e791e572fc4a95e80cfcbafc8c248d 6f08545026cffc0c0bac663a383112c0e09866a8 M Library/Homebrew/cmd/deps.rb
:100644 100644 26d6cb9adf48e5f47eb40399879d3df15c5fe99f 2276f1c4a81feb17ab12d888a3039f61d2bfc9bb M Library/Homebrew/cmd/doctor.rb
:100644 100644 535f52b17def25a5197e80b73290a19b1c1f76b9 7abe9ec6733fd0d477a6de37b1b08a3d68663ff5 M Library/Homebrew/cmd/info.rb
:000000 100644 0000000000000000000000000000000000000000 697355f1588fa328348c1cc5bd1d1c599614a590 A Library/Homebrew/compat.rb
:100644 000000 941b078cc4f7e24331bac1de6e419c90a6272565 0000000000000000000000000000000000000000 D Library/Homebrew/compat/compatibility.rb
:000000 100644 0000000000000000000000000000000000000000 73f9b000921b932615fbb34679c2eee2b398dde7 A Library/Homebrew/compat/env.rb
:000000 100644 0000000000000000000000000000000000000000 19338ceb54f52523e8f195017526aa435d580a27 A Library/Homebrew/compat/fails_with_llvm.rb
:000000 100644 0000000000000000000000000000000000000000 509ff5d1800ce681a019476ff99a99e63df7e0f7 A Library/Homebrew/compat/formula.rb
:100644 100644 550c10118d5dea79cc0ffdf4ca26170c353c341f 550c10118d5dea79cc0ffdf4ca26170c353c341f R100 Library/Homebrew/compat/hardware_compat.rb Library/Homebrew/compat/hardware.rb
:000000 100644 0000000000000000000000000000000000000000 2b3cb9d811166702b13067c4166308d79d7fe33e A Library/Homebrew/compat/macos.rb
:000000 100644 0000000000000000000000000000000000000000 d600bab6d2ff9a634d02100a4b615d72d9489d94 A Library/Homebrew/compat/md5.rb
:000000 100644 0000000000000000000000000000000000000000 027df9fc37fd28ce2e3ac91eb84aa807f51fd581 A Library/Homebrew/compat/version.rb
:100644 100644 2a1d7d880c748531cc47dea774da5193c678b71b 50ff5c90f80ae8734e19c3233702d3789856ba4b M Library/Homebrew/dependable.rb
:100644 100644 76d285b5608d8167ac69c60b9c87ab16bae1773e 9d5c3dede439f91824e739d875d59f155ae8d668 M Library/Homebrew/dependencies.rb
:100644 100644 6c78e10ac0907e93a4ac3419e6589771f18a0ccf d87d74ccf85b1ffceadcc52c2a3a3dbafd4ed808 M Library/Homebrew/dependency.rb
:100644 100644 097f002d2dd2dc9479339ef908a93f9132dcd613 8b36a5b3d7d028230c6344987444417220ad03b4 M Library/Homebrew/extend/ENV.rb
:100644 100644 8973728b4876d51773e9c4606e1c4d5e5d97b4a4 dafb18ed0c6ad2851a70fcbbb1549a35fd6845e8 M Library/Homebrew/formula.rb
:100644 100644 da834467b17d4e4827511510d46b53f175ee2e19 8d43afcf2673eb8a8b78b50b897512a924347785 M Library/Homebrew/global.rb
:100644 100644 b139215aee3b5ab5db83c0674a671bda2b37137d 69f87eade41d4b86d3f006d31f85ec91fa45c027 M Library/Homebrew/hardware.rb
:100644 100644 802da0de6254fbc09fce13bd1c595abfd02b55b0 bae263f37e8b1f590b385e99a36f737197551c1f M Library/Homebrew/macos.rb
:100644 100644 c2027389588c41696d8705fdf44e67c706576ddc 4cae1f2468654e78840ec5a9e9ed4099a3848088 M Library/Homebrew/requirement.rb
:100644 100644 29e61b6963e5856d6dd5c23cc797f72555245843 bdbe71ee00492c639e35290819ff68e7be59e278 M Library/Homebrew/requirements.rb
:100644 100644 b51efc303cfaa168bf6b0a348639569f16d13f92 e83f7d80c925ade74016c5b99d433606fa1cf67e M Library/Homebrew/requirements/mpi_dependency.rb
:100644 100644 8c2d522b8e9cff945bb50674accf1e5d3bc8a4cf b8dfa7f25dff90a008ebfee2aa19f790f06cd16d M Library/Homebrew/superenv.rb
:100644 100644 d0d078318f4d31dceefc9dfde54f2c46b9decb2f ee7574c2bb17043509561407b452694dfc8538dd M Library/Homebrew/test/test_dependencies.rb
:000000 100644 0000000000000000000000000000000000000000 02a05dd1af0b09e32443e1f6945ff87ec3b3c600 A Library/Homebrew/test/test_dependency_expansion.rb
:100644 100644 731ef5b860cbca093ef1c29e4ae7297790195fdc 8e3c92a3241682ce8b4c87bbef29b1bd89b34a84 M Library/Homebrew/test/testing_env.rb
git checkout -q master
==> git rev-parse -q --verify HEAD
590070b38c0dfba19eee6cec69f2c02f0e4490c9
git config core.autocrlf false
git pull origin refs/heads/master:refs/remotes/origin/master
remote: Counting objects: 3, done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 2 (delta 1), reused 1 (delta 0)
Unpacking objects: 100% (2/2), done.
From https://github.com/Homebrew/homebrew-dupes
590070b..efe94c5 master -> origin/master
Updating 590070b..efe94c5
Fast-forward
libarchive.rb | 12 ------------
1 file changed, 12 deletions(-)
delete mode 100644 libarchive.rb
==> git rev-parse -q --verify HEAD
efe94c58d4b9c071d2812a94e2a92d02e42ba00a
==> git diff-tree -r --raw -M85% 590070b38c0dfba19eee6cec69f2c02f0e4490c9 efe94c58d4b9c071d2812a94e2a92d02e42ba00a
:100644 000000 39a3d8b0ba093275cf7ec7cbaee9cccdccb7daed 0000000000000000000000000000000000000000 D libarchive.rb
git checkout -q master
==> git rev-parse -q --verify HEAD
2c345b92b75bc7d1d2fe634f27a07e503db32358
git config core.autocrlf false
git pull origin refs/heads/master:refs/remotes/origin/master
remote: Counting objects: 119, done.
remote: Compressing objects: 100% (51/51), done.
remote: Total 83 (delta 69), reused 45 (delta 32)
Unpacking objects: 100% (83/83), done.
From https://github.com/josegonzalez/homebrew-php
2c345b9..f5d3fee master -> origin/master
Updating 2c345b9..f5d3fee
Fast-forward
Formula/abstract-php.rb | 2 +-
Formula/php53-dbase.rb | 2 +-
Formula/php53-geoip.rb | 1 -
Formula/php53-intl.rb | 6 +++---
Formula/php53-ioncubeloader.rb | 5 ++---
Formula/php53-libevent.rb | 2 +-
Formula/php53-libvirt.rb | 2 +-
Formula/php53-lzf.rb | 2 +-
Formula/php53-mcrypt.rb | 6 +++---
Formula/php53-memcached.rb | 12 ++++--------
Formula/php53-midgard2.rb | 2 +-
Formula/php53-pcntl.rb | 6 +++---
Formula/php53-phalcon.rb | 2 +-
Formula/php53-pspell.rb | 6 +++---
Formula/php53-redis.rb | 10 +++-------
Formula/php53-timezonedb.rb | 3 +--
Formula/php53-tokyotyrant.rb | 9 ++-------
Formula/php53-twig.rb | 2 +-
Formula/php53-xhprof.rb | 16 ++++++++--------
Formula/php53.rb | 6 +++---
Formula/php54-dbase.rb | 2 +-
Formula/php54-geoip.rb | 1 -
Formula/php54-intl.rb | 6 +++---
Formula/php54-ioncubeloader.rb | 5 ++---
Formula/php54-libevent.rb | 2 +-
Formula/php54-lzf.rb | 2 +-
Formula/php54-mcrypt.rb | 6 +++---
Formula/php54-memcached.rb | 12 ++++--------
Formula/php54-midgard2.rb | 2 +-
Formula/php54-pcntl.rb | 6 +++---
Formula/php54-phalcon.rb | 2 +-
Formula/php54-pspell.rb | 6 +++---
Formula/php54-redis.rb | 10 +++-------
Formula/php54-timezonedb.rb | 3 +--
Formula/php54-tokyotyrant.rb | 7 +------
Formula/php54-twig.rb | 2 +-
Formula/php54.rb | 6 +++---
README.md | 8 ++++----
38 files changed, 79 insertions(+), 111 deletions(-)
==> git rev-parse -q --verify HEAD
f5d3feef88dc20aa38922391603db9bdeebe568a
==> git diff-tree -r --raw -M85% 2c345b92b75bc7d1d2fe634f27a07e503db32358 f5d3feef88dc20aa38922391603db9bdeebe568a
:100644 100644 50b6b88a9578ed9ac510653e062b8753d4b4b417 c410946f3e9226d91a896eb1569a6060398f7722 M Formula/abstract-php.rb
:100644 100644 8117e8f045e430af340df507b6d2be6138d23cd7 d01d25e15478231204f10989f12330f78ee06c69 M Formula/php53-dbase.rb
:100644 100644 669a6fdb5171bd0d09e5cae740cc5700daa9ddb0 59890e76bd24bb82688c48ce6a6e8808cc173649 M Formula/php53-geoip.rb
:100644 100644 17d3eb10ece85e527d83feed27a720c8963924a2 2637528efd976cd5b6634270245575b558987cb6 M Formula/php53-intl.rb
:100644 100644 698ba9d160afe0bbd20fa331d762f0f2ad1c0605 9e40d277c53705acc5f95b2c1fa7f4f4b7f54079 M Formula/php53-ioncubeloader.rb
:100644 100644 071df9c0bc990a3e36a6c47d2594093ce206cfa8 8b73f19ef55efb80685dd12070ae109e26bd7323 M Formula/php53-libevent.rb
:100644 100644 d2202387cea6ab1fed7f9f004c80f6cc12fd3448 1ff5fb96894398f38d81645bdc948664dfe428b7 M Formula/php53-libvirt.rb
:100644 100644 bc650d13e183b6e1519665ee3936b4e4b9962b16 99f1a4dfa6cefa013b4273b2c71479afe82c2a90 M Formula/php53-lzf.rb
:100644 100644 c06c1337ee68831086494c960c13299a9d116d09 de8df6db3d4b841d95e61a9206734148f423bde5 M Formula/php53-mcrypt.rb
:100644 100644 8b5510971c3caa8c26af1e7b055917440ea47699 c26c2724da39abd4a323143d59c2c9f2a9ada22e M Formula/php53-memcached.rb
:100644 100644 e4ccc030e8e6e3fea0bfaf50964de701b439e9ae 1b1d33c9e2f4696052cac31b992940d0f9398ec0 M Formula/php53-midgard2.rb
:100644 100644 63748e325271901a13d5e710f17b1ac26a11c5af 2b0ad578729713a8aa95714893828e84292a3c89 M Formula/php53-pcntl.rb
:100644 100644 60b9040251694d3d7738d9f5cf651afdbd776b2b bd63c70ceb1ebf1971224205e98907157ca19b71 M Formula/php53-phalcon.rb
:100644 100644 ae56d4fa73302c8a162e3b7fd78f951926f0812e 9818a21d390265e3b3d1921c78e34440840ccd8e M Formula/php53-pspell.rb
:100644 100644 cd782d414ece0a4ddfbf7eb2235debdd8bb37e94 bd7af1f310188229549054ee6431d350fbeeb01a M Formula/php53-redis.rb
:100644 100644 fc86d70016777af91c782348342aeca11e7bd841 0ced22cb168650fc8fddd5f53971f20f0bfa8910 M Formula/php53-timezonedb.rb
:100644 100644 821310cb4efade2193853558f0e71451e71c4d7c d46f057c0eaa9319476ad18a55c213579a3a8de7 M Formula/php53-tokyotyrant.rb
:100644 100644 ca4062a9a77f4197ca047a98816f1c01e5a03fc1 de5754b7df0097b076ce99bfe35cffb7a7fb0f17 M Formula/php53-twig.rb
:100644 100644 0ec48463e1e008e9f224e270b014a3f931333817 3df1c9d7396d44b269fea8f3e162189c07c2c2da M Formula/php53-xhprof.rb
:100644 100644 cb8f68c19d8c78e306e9182b07f1c3d753f5f091 515f08874df027d85fa92734882ef3c65ede3cc5 M Formula/php53.rb
:100644 100644 d949a2521ae100ac9ea5e72088cec998ff5fd749 d82870eff9248868b9277dad77f8cd437f144b59 M Formula/php54-dbase.rb
:100644 100644 18ae290757358d90ff18b6c88c39a4929589aeb7 920dc84dcfcc17b798ade39d767c085b5c66abdb M Formula/php54-geoip.rb
:100644 100644 7b6dd176a9a4564d2daec9d6794179d3cac1ffc6 d3cc8ab2262afb472fd6f6cd6e65ccb9473b1806 M Formula/php54-intl.rb
:100644 100644 f07ca4ebb2ed1fda2166468f706f3c9c6bd9bcee 8dc1267904c98e772d691efedea478d3876a0e2b M Formula/php54-ioncubeloader.rb
:100644 100644 266954a5f701d9808b8acf966a00f8a65eccb4f2 86e7316a032e820695715beb082b6bd31283668c M Formula/php54-libevent.rb
:100644 100644 ba23c93e13cb67cdcf9d171b681bd1d6204e229a 0940990cbcdb4d8642dcfcf9c1d59d578e770e9d M Formula/php54-lzf.rb
:100644 100644 fe2ec7aef4f55b849019b4c34264af3ee2cf2408 d86e6e01a58e1ee152488edb0fee540c4180474f M Formula/php54-mcrypt.rb
:100644 100644 0c639fdec378d6afb5e0bb70f13f1b8de608bbf3 8dbe392494d4975f69aa2dc05f33cf1515a4fe18 M Formula/php54-memcached.rb
:100644 100644 43db45c01f33fd74047488aacfb27b57ea6328f7 99010cae96746b2a6f70df361cd7d4bfda54a440 M Formula/php54-midgard2.rb
:100644 100644 7cba1ffd273f38bec29bcf024aa213eff0a70875 99121065d8a77eacc315bf81b77c3354bb976b46 M Formula/php54-pcntl.rb
:100644 100644 d6cf1679abe6295bf2e9f0907c1b842d2672b767 f4e9139764ee40ad4e818e454ba86c7766acd163 M Formula/php54-phalcon.rb
:100644 100644 458d251175328cec5fa197c71a8a0b8715720f42 05c3ac2fb219963bc5f25d441c975d84210c69cb M Formula/php54-pspell.rb
:100644 100644 0837ace743a21cb676961c60e4caca3a176cb577 0cd5c94dc525d37231fa7ae830cfbc9e35dab3b7 M Formula/php54-redis.rb
:100644 100644 d84bddb9f77d3bc07f9459faa7069fb79ffdc020 6ffbf593a2c4a5ce30127d6eae5fee3424664a57 M Formula/php54-timezonedb.rb
:100644 100644 35a7d5dc5699f99c167fdcf8cf4c8a9e31822f9a 74c0d2e2b5f36c69af92591947842e23f9f49efc M Formula/php54-tokyotyrant.rb
:100644 100644 1c9f4aaa4508503c992864f44e6b9507ce23a6de 77f57a82496f70112729d9c1bc8e96cc3e994fef M Formula/php54-twig.rb
:100755 100755 2a76b51f5f9175c3359c422b5fd39cc933c78015 b13820d31f171aca2420e771bb44ca289629cf81 M Formula/php54.rb
:100644 100644 7cb2d801ec3c33509775571761cf147dd2248fae 1ac40906b6beaa54dd2b841819f9056aaa4199dd M README.md
git checkout -q master
==> git rev-parse -q --verify HEAD
973697f15776c639abcad9aca1dfa2e3760a5d9b
git config core.autocrlf false
git pull origin refs/heads/master:refs/remotes/origin/master
Already up-to-date.
==> git rev-parse -q --verify HEAD
973697f15776c639abcad9aca1dfa2e3760a5d9b
Updated Homebrew from 1c82a6a1 to 71854910.
==> New Formulae
libarchive rpm
==> Updated Formulae
arangodb josegonzalez/php/php54-lzf
easy-tag josegonzalez/php/php54-mcrypt
elixir josegonzalez/php/php54-memcached
fop josegonzalez/php/php54-midgard2
gmp josegonzalez/php/php54-pcntl
go josegonzalez/php/php54-phalcon
hbase josegonzalez/php/php54-pspell
httrack josegonzalez/php/php54-redis
ios-webkit-debug-proxy josegonzalez/php/php54-timezonedb
jetty josegonzalez/php/php54-tokyotyrant
josegonzalez/php/abstract-php josegonzalez/php/php54-twig
josegonzalez/php/php53 lame
josegonzalez/php/php53-dbase libgpg-error
josegonzalez/php/php53-geoip libksba
josegonzalez/php/php53-intl libogg
josegonzalez/php/php53-ioncubeloader libslax
josegonzalez/php/php53-libevent libvorbis
josegonzalez/php/php53-libvirt macvim
josegonzalez/php/php53-lzf mu
josegonzalez/php/php53-mcrypt mysql-connector-odbc
josegonzalez/php/php53-memcached open-ocd
josegonzalez/php/php53-midgard2 pixman
josegonzalez/php/php53-pcntl pv
josegonzalez/php/php53-phalcon qt
josegonzalez/php/php53-pspell rdup
josegonzalez/php/php53-redis shocco
josegonzalez/php/php53-timezonedb signing-party
josegonzalez/php/php53-tokyotyrant sleuthkit
josegonzalez/php/php53-twig solr
josegonzalez/php/php53-xhprof spdylay
josegonzalez/php/php54 squid
josegonzalez/php/php54-dbase vert.x
josegonzalez/php/php54-geoip vim
josegonzalez/php/php54-intl xctool
josegonzalez/php/php54-ioncubeloader youtube-dl
josegonzalez/php/php54-libevent
==> Deleted Formulae
bigloo homebrew/dupes/libarchive
表示通り、該当ファイルを move or remove
[zunermuka ~]$ brew update
error: The following untracked working tree files would be overwritten by merge:
Library/Formula/libarchive.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
[zunermuka ~]$ mv /usr/local/Library/Formula/libarchive.rb /usr/local/Library/Formula/libarchive.rb.`date +%Y%m%d%H%M%S`
nrhd（使ってみたかっただけ）
[zunermuka ~]$ brew update -v
git checkout -q master
==> git rev-parse -q --verify HEAD
1c82a6a184f7aff224dbc98ed88f358e48c4d2cc
git config core.autocrlf false
git pull origin refs/heads/master:refs/remotes/origin/master
Updating 1c82a6a..7185491
Fast-forward
Library/ENV/4.3/cc | 23 ++-
Library/Formula/arangodb.rb | 10 +-
Library/Formula/bigloo.rb | 39 ----
Library/Formula/easy-tag.rb | 2 +-
Library/Formula/elixir.rb | 1 +
Library/Formula/fop.rb | 34 +---
Library/Formula/gmp.rb | 7 +
Library/Formula/go.rb | 6 +-
Library/Formula/hbase.rb | 4 +-
Library/Formula/httrack.rb | 5 +-
Library/Formula/ios-webkit-debug-proxy.rb | 4 +-
Library/Formula/jetty.rb | 6 +-
Library/Formula/lame.rb | 3 +-
Library/Formula/libarchive.rb | 18 ++
Library/Formula/libgpg-error.rb | 2 +-
Library/Formula/libksba.rb | 1 +
Library/Formula/libogg.rb | 4 +
Library/Formula/libslax.rb | 4 +-
Library/Formula/libvorbis.rb | 4 +
Library/Formula/macvim.rb | 2 +-
Library/Formula/mu.rb | 1 +
Library/Formula/mysql-connector-odbc.rb | 1 +
Library/Formula/open-ocd.rb | 13 +-
Library/Formula/pixman.rb | 4 +-
Library/Formula/pv.rb | 4 +-
Library/Formula/qt.rb | 4 +-
Library/Formula/rdup.rb | 19 +-
Library/Formula/rpm.rb | 67 +++++++
Library/Formula/shocco.rb | 1 +
Library/Formula/signing-party.rb | 1 +
Library/Formula/sleuthkit.rb | 9 +
Library/Formula/solr.rb | 4 +-
Library/Formula/spdylay.rb | 2 +-
Library/Formula/squid.rb | 13 +-
Library/Formula/vert.x.rb | 2 +-
Library/Formula/vim.rb | 4 +-
Library/Formula/xctool.rb | 4 +-
Library/Formula/youtube-dl.rb | 4 +-
Library/Homebrew/cmd/deps.rb | 4 +-
Library/Homebrew/cmd/doctor.rb | 2 +-
Library/Homebrew/cmd/info.rb | 15 +-
Library/Homebrew/compat.rb | 7 +
Library/Homebrew/compat/compatibility.rb | 216 ---------------------
Library/Homebrew/compat/env.rb | 13 ++
Library/Homebrew/compat/fails_with_llvm.rb | 17 ++
Library/Homebrew/compat/formula.rb | 29 +++
.../compat/{hardware_compat.rb => hardware.rb} | 0
Library/Homebrew/compat/macos.rb | 56 ++++++
Library/Homebrew/compat/md5.rb | 23 +++
Library/Homebrew/compat/version.rb | 6 +
Library/Homebrew/dependable.rb | 4 +
Library/Homebrew/dependencies.rb | 20 ++
Library/Homebrew/dependency.rb | 42 ++--
Library/Homebrew/extend/ENV.rb | 2 +-
Library/Homebrew/formula.rb | 2 +-
Library/Homebrew/global.rb | 5 +-
Library/Homebrew/hardware.rb | 2 -
Library/Homebrew/macos.rb | 12 ++
Library/Homebrew/requirement.rb | 12 ++
Library/Homebrew/requirements.rb | 3 +
Library/Homebrew/requirements/mpi_dependency.rb | 2 +
Library/Homebrew/superenv.rb | 12 +-
Library/Homebrew/test/test_dependencies.rb | 14 ++
Library/Homebrew/test/test_dependency_expansion.rb | 61 ++++++
Library/Homebrew/test/testing_env.rb | 5 +-
65 files changed, 517 insertions(+), 405 deletions(-)
delete mode 100644 Library/Formula/bigloo.rb
create mode 100644 Library/Formula/libarchive.rb
create mode 100644 Library/Formula/rpm.rb
create mode 100644 Library/Homebrew/compat.rb
delete mode 100644 Library/Homebrew/compat/compatibility.rb
create mode 100644 Library/Homebrew/compat/env.rb
create mode 100644 Library/Homebrew/compat/fails_with_llvm.rb
create mode 100644 Library/Homebrew/compat/formula.rb
rename Library/Homebrew/compat/{hardware_compat.rb => hardware.rb} (100%)
create mode 100644 Library/Homebrew/compat/macos.rb
create mode 100644 Library/Homebrew/compat/md5.rb
create mode 100644 Library/Homebrew/compat/version.rb
create mode 100644 Library/Homebrew/test/test_dependency_expansion.rb
==> git rev-parse -q --verify HEAD
7185491097119c5e55910edebaa3aa7b0066799f
==> git diff-tree -r --raw -M85% 1c82a6a184f7aff224dbc98ed88f358e48c4d2cc 7185491097119c5e55910edebaa3aa7b0066799f
:100755 100755 85f57817dfb35264d947ce0b8d51c465d4ec16f4 3d6241c1fd2d4bf208c08afbf0100e7d142e8c22 M Library/ENV/4.3/cc
:100644 100644 26faf86cbc1ab49fba2a9e1587a7a13019827df5 2bc958ff0d3f83a73670992eac3c98cd8ecf7d5e M Library/Formula/arangodb.rb
:100644 000000 328d57fd4aed95f5e927694da58e28b9362f5693 0000000000000000000000000000000000000000 D Library/Formula/bigloo.rb
:100644 100644 db9fc4ca42b8c3192c1819f0a1b4bd8e782db219 64d889768ca5b3eb81281562104932869b63d989 M Library/Formula/easy-tag.rb
:100644 100644 74b133d9120ca5abed92ef80a65715392a65276a c129bac148e5d983ef2db2bb45e734b66afe9204 M Library/Formula/elixir.rb
:100644 100644 6a6ac13f0a01f89e08bc981191b9d817fe0d5965 6fb22946550f3948099d5965d462fb577b9d294c M Library/Formula/fop.rb
:100644 100644 d74a7804a258d6e8ebee44006e29d911502bacf6 f12a268c15929b04c198be7a0cffdb8a28f4dd89 M Library/Formula/gmp.rb
:100644 100644 d944830a57adab982c5976fba5e6559eb0e06e8e e30487a995a665d0bc7f976b058c2f15b0d48728 M Library/Formula/go.rb
:100644 100644 5df0254305742d66332a6f59c67ad955fcfd9aca 1d4ca28bc931233f8218d2b0c93537b22a79fdbb M Library/Formula/hbase.rb
:100644 100644 e487b761e6428d3562539a5c8e6283792d636a30 8fa52e24205e80a7440c934a87f73173da0e6ce9 M Library/Formula/httrack.rb
:100644 100644 d36ad950f5b13896f59287b0d7e4a74b91bb94f9 cfc1352b7de1ab3d36c03a60bd0b28ef7abc6b15 M Library/Formula/ios-webkit-debug-proxy.rb
:100644 100644 157327c1135c11c8c065f611b63bf49a4082d87d c3d22bccacdbab50f5a8a9cf75007160921ee670 M Library/Formula/jetty.rb
:100644 100644 c0533eccca35e97cbd39d468d0323dad3429e106 851a46cfbaa2952068ebd60ea5c696c4687a5791 M Library/Formula/lame.rb
:000000 100644 0000000000000000000000000000000000000000 d4613921da768b7fc404db8ddb57fcf9899061f7 A Library/Formula/libarchive.rb
:100644 100644 df5aee07bae878f8f2c0327bfd05f1154428f20d 5eef49177c77c43207eae5cff9bb492c5454a0e4 M Library/Formula/libgpg-error.rb
:100644 100644 b343e7842445639c6af0ed6606f294f63b428ec7 c352a1e0d74b81d9b0bae05793d0c4457b04848c M Library/Formula/libksba.rb
:100644 100644 276417685ac92dd699bf394edf3759bf8185869c 82d23376e662c59e63be0e9e0a906bdb39c17944 M Library/Formula/libogg.rb
:100644 100644 fd6840e4095edc6af7df6cfad7ada15a6c807ff6 39546063d8c21baf684f1a9a001cabe0bcfba41a M Library/Formula/libslax.rb
:100644 100644 d38c0ca4dda6bfa3668bf81c59af50d591abcdaf 835a0c30f96faceba368a2d67d5fb61d36cfc2f6 M Library/Formula/libvorbis.rb
:100644 100644 21bf41a3ac1a511ee47533642610a07a5428de65 2ab7ee02a3fcbc1db664e9d56393c6f4dfecc06a M Library/Formula/macvim.rb
:100644 100644 9b50c5ea3c5f95c86571b36c91c579a452c4c14c 2d9d18f9a532ecaed1780f0e9ca4004197af29c0 M Library/Formula/mu.rb
:100644 100644 06a7ed6d9b54958c734b55876df4f046fa1d8da6 6bbbe3a7cb8c5cdf0636f04d9ba49b35fb8fdfc6 M Library/Formula/mysql-connector-odbc.rb
:100644 100644 494e0fa12cbf2067bd15df63faf5c6bdbd01def4 4ba68b4e7323aea0461a33b62a52b80f1ecafcf6 M Library/Formula/open-ocd.rb
:100644 100644 6d5b89dd0fb3e895e0e7312a338b14c084bc7ab2 cf189e2ec16bd3d3882036385e3d783b237d93e3 M Library/Formula/pixman.rb
:100644 100644 ee1e3ad37f6def5f27099c1030aec1d11fa9a66a 5d98833634b39780feeea0e3f6e1b7b19cd9f78d M Library/Formula/pv.rb
:100644 100644 e592c25b37ad2a897457a1adbda8f9a2d47135ee 8d0dd3b9e32229a55817e6212fbbcdeece77938e M Library/Formula/qt.rb
:100644 100644 90b7da226b3ab29c6e2bbb441fe6fe9e506ca8fe 060ba370aaed4b690a3d5843447700bf8858ddce M Library/Formula/rdup.rb
:000000 100644 0000000000000000000000000000000000000000 6eba3dd508b5681370166b35d83495603415449f A Library/Formula/rpm.rb
:100644 100644 bd69595179584f01bcf708d23e87051df752d3fb c30df7b24b5026df5f3af6e68ffd28b04829fc2b M Library/Formula/shocco.rb
:100644 100644 dfa02fae57e6171b2524e3b17cc65a9cd735193c ecbb8c6b71bd21534a02faa4d37189b29c31749a M Library/Formula/signing-party.rb
:100644 100644 3b0f266c2f4c5fb00fa58246238a9c06f5e54eb3 035edc84725121a99036167f168ad393ceb9bc97 M Library/Formula/sleuthkit.rb
:100644 100644 e668b773af4eff2548e099ed22a82aab8893aa64 37be133ab9c2fd041c82f745f7cbb95d395d314d M Library/Formula/solr.rb
:100644 100644 3ddfb6848a1c0e810d0ddbaef6213f818b9614c4 8602fd1ac8199d4a14e1adafc3874352a199f5e0 M Library/Formula/spdylay.rb
:100644 100644 ceae2bedb9492c239dafc57640cef2f1de85ebad 16692dd2c0204620676bdbf7e945651aa5179a07 M Library/Formula/squid.rb
:100644 100644 017e34162afcc942e23d7d8f8cfd95108b3a1af8 cdb3a85c6fbc30415344deb17cfc319e64d37aac M Library/Formula/vert.x.rb
:100644 100644 a84cda7ef97ec1df350dbbaad2f481b686a99c4e c74b41d804a2016edd180a7070f75b46f6cfa37e M Library/Formula/vim.rb
:100644 100644 ce6c6d20082512de8e3afeeb8a9106f473aea91f bf1781aec802244a7245ee488f01b5b58ad5a305 M Library/Formula/xctool.rb
:100644 100644 7485ae0759cd350fa3696915f6c7d6ee205cab8c 1fa100b6c4beb252605dc7a911168fa711adc267 M Library/Formula/youtube-dl.rb
:100644 100644 eb819ef541e791e572fc4a95e80cfcbafc8c248d 6f08545026cffc0c0bac663a383112c0e09866a8 M Library/Homebrew/cmd/deps.rb
:100644 100644 26d6cb9adf48e5f47eb40399879d3df15c5fe99f 2276f1c4a81feb17ab12d888a3039f61d2bfc9bb M Library/Homebrew/cmd/doctor.rb
:100644 100644 535f52b17def25a5197e80b73290a19b1c1f76b9 7abe9ec6733fd0d477a6de37b1b08a3d68663ff5 M Library/Homebrew/cmd/info.rb
:000000 100644 0000000000000000000000000000000000000000 697355f1588fa328348c1cc5bd1d1c599614a590 A Library/Homebrew/compat.rb
:100644 000000 941b078cc4f7e24331bac1de6e419c90a6272565 0000000000000000000000000000000000000000 D Library/Homebrew/compat/compatibility.rb
:000000 100644 0000000000000000000000000000000000000000 73f9b000921b932615fbb34679c2eee2b398dde7 A Library/Homebrew/compat/env.rb
:000000 100644 0000000000000000000000000000000000000000 19338ceb54f52523e8f195017526aa435d580a27 A Library/Homebrew/compat/fails_with_llvm.rb
:000000 100644 0000000000000000000000000000000000000000 509ff5d1800ce681a019476ff99a99e63df7e0f7 A Library/Homebrew/compat/formula.rb
:100644 100644 550c10118d5dea79cc0ffdf4ca26170c353c341f 550c10118d5dea79cc0ffdf4ca26170c353c341f R100 Library/Homebrew/compat/hardware_compat.rb Library/Homebrew/compat/hardware.rb
:000000 100644 0000000000000000000000000000000000000000 2b3cb9d811166702b13067c4166308d79d7fe33e A Library/Homebrew/compat/macos.rb
:000000 100644 0000000000000000000000000000000000000000 d600bab6d2ff9a634d02100a4b615d72d9489d94 A Library/Homebrew/compat/md5.rb
:000000 100644 0000000000000000000000000000000000000000 027df9fc37fd28ce2e3ac91eb84aa807f51fd581 A Library/Homebrew/compat/version.rb
:100644 100644 2a1d7d880c748531cc47dea774da5193c678b71b 50ff5c90f80ae8734e19c3233702d3789856ba4b M Library/Homebrew/dependable.rb
:100644 100644 76d285b5608d8167ac69c60b9c87ab16bae1773e 9d5c3dede439f91824e739d875d59f155ae8d668 M Library/Homebrew/dependencies.rb
:100644 100644 6c78e10ac0907e93a4ac3419e6589771f18a0ccf d87d74ccf85b1ffceadcc52c2a3a3dbafd4ed808 M Library/Homebrew/dependency.rb
:100644 100644 097f002d2dd2dc9479339ef908a93f9132dcd613 8b36a5b3d7d028230c6344987444417220ad03b4 M Library/Homebrew/extend/ENV.rb
:100644 100644 8973728b4876d51773e9c4606e1c4d5e5d97b4a4 dafb18ed0c6ad2851a70fcbbb1549a35fd6845e8 M Library/Homebrew/formula.rb
:100644 100644 da834467b17d4e4827511510d46b53f175ee2e19 8d43afcf2673eb8a8b78b50b897512a924347785 M Library/Homebrew/global.rb
:100644 100644 b139215aee3b5ab5db83c0674a671bda2b37137d 69f87eade41d4b86d3f006d31f85ec91fa45c027 M Library/Homebrew/hardware.rb
:100644 100644 802da0de6254fbc09fce13bd1c595abfd02b55b0 bae263f37e8b1f590b385e99a36f737197551c1f M Library/Homebrew/macos.rb
:100644 100644 c2027389588c41696d8705fdf44e67c706576ddc 4cae1f2468654e78840ec5a9e9ed4099a3848088 M Library/Homebrew/requirement.rb
:100644 100644 29e61b6963e5856d6dd5c23cc797f72555245843 bdbe71ee00492c639e35290819ff68e7be59e278 M Library/Homebrew/requirements.rb
:100644 100644 b51efc303cfaa168bf6b0a348639569f16d13f92 e83f7d80c925ade74016c5b99d433606fa1cf67e M Library/Homebrew/requirements/mpi_dependency.rb
:100644 100644 8c2d522b8e9cff945bb50674accf1e5d3bc8a4cf b8dfa7f25dff90a008ebfee2aa19f790f06cd16d M Library/Homebrew/superenv.rb
:100644 100644 d0d078318f4d31dceefc9dfde54f2c46b9decb2f ee7574c2bb17043509561407b452694dfc8538dd M Library/Homebrew/test/test_dependencies.rb
:000000 100644 0000000000000000000000000000000000000000 02a05dd1af0b09e32443e1f6945ff87ec3b3c600 A Library/Homebrew/test/test_dependency_expansion.rb
:100644 100644 731ef5b860cbca093ef1c29e4ae7297790195fdc 8e3c92a3241682ce8b4c87bbef29b1bd89b34a84 M Library/Homebrew/test/testing_env.rb
git checkout -q master
==> git rev-parse -q --verify HEAD
590070b38c0dfba19eee6cec69f2c02f0e4490c9
git config core.autocrlf false
git pull origin refs/heads/master:refs/remotes/origin/master
remote: Counting objects: 3, done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 2 (delta 1), reused 1 (delta 0)
Unpacking objects: 100% (2/2), done.
From https://github.com/Homebrew/homebrew-dupes
590070b..efe94c5 master -> origin/master
Updating 590070b..efe94c5
Fast-forward
libarchive.rb | 12 ------------
1 file changed, 12 deletions(-)
delete mode 100644 libarchive.rb
==> git rev-parse -q --verify HEAD
efe94c58d4b9c071d2812a94e2a92d02e42ba00a
==> git diff-tree -r --raw -M85% 590070b38c0dfba19eee6cec69f2c02f0e4490c9 efe94c58d4b9c071d2812a94e2a92d02e42ba00a
:100644 000000 39a3d8b0ba093275cf7ec7cbaee9cccdccb7daed 0000000000000000000000000000000000000000 D libarchive.rb
git checkout -q master
==> git rev-parse -q --verify HEAD
2c345b92b75bc7d1d2fe634f27a07e503db32358
git config core.autocrlf false
git pull origin refs/heads/master:refs/remotes/origin/master
remote: Counting objects: 119, done.
remote: Compressing objects: 100% (51/51), done.
remote: Total 83 (delta 69), reused 45 (delta 32)
Unpacking objects: 100% (83/83), done.
From https://github.com/josegonzalez/homebrew-php
2c345b9..f5d3fee master -> origin/master
Updating 2c345b9..f5d3fee
Fast-forward
Formula/abstract-php.rb | 2 +-
Formula/php53-dbase.rb | 2 +-
Formula/php53-geoip.rb | 1 -
Formula/php53-intl.rb | 6 +++---
Formula/php53-ioncubeloader.rb | 5 ++---
Formula/php53-libevent.rb | 2 +-
Formula/php53-libvirt.rb | 2 +-
Formula/php53-lzf.rb | 2 +-
Formula/php53-mcrypt.rb | 6 +++---
Formula/php53-memcached.rb | 12 ++++--------
Formula/php53-midgard2.rb | 2 +-
Formula/php53-pcntl.rb | 6 +++---
Formula/php53-phalcon.rb | 2 +-
Formula/php53-pspell.rb | 6 +++---
Formula/php53-redis.rb | 10 +++-------
Formula/php53-timezonedb.rb | 3 +--
Formula/php53-tokyotyrant.rb | 9 ++-------
Formula/php53-twig.rb | 2 +-
Formula/php53-xhprof.rb | 16 ++++++++--------
Formula/php53.rb | 6 +++---
Formula/php54-dbase.rb | 2 +-
Formula/php54-geoip.rb | 1 -
Formula/php54-intl.rb | 6 +++---
Formula/php54-ioncubeloader.rb | 5 ++---
Formula/php54-libevent.rb | 2 +-
Formula/php54-lzf.rb | 2 +-
Formula/php54-mcrypt.rb | 6 +++---
Formula/php54-memcached.rb | 12 ++++--------
Formula/php54-midgard2.rb | 2 +-
Formula/php54-pcntl.rb | 6 +++---
Formula/php54-phalcon.rb | 2 +-
Formula/php54-pspell.rb | 6 +++---
Formula/php54-redis.rb | 10 +++-------
Formula/php54-timezonedb.rb | 3 +--
Formula/php54-tokyotyrant.rb | 7 +------
Formula/php54-twig.rb | 2 +-
Formula/php54.rb | 6 +++---
README.md | 8 ++++----
38 files changed, 79 insertions(+), 111 deletions(-)
==> git rev-parse -q --verify HEAD
f5d3feef88dc20aa38922391603db9bdeebe568a
==> git diff-tree -r --raw -M85% 2c345b92b75bc7d1d2fe634f27a07e503db32358 f5d3feef88dc20aa38922391603db9bdeebe568a
:100644 100644 50b6b88a9578ed9ac510653e062b8753d4b4b417 c410946f3e9226d91a896eb1569a6060398f7722 M Formula/abstract-php.rb
:100644 100644 8117e8f045e430af340df507b6d2be6138d23cd7 d01d25e15478231204f10989f12330f78ee06c69 M Formula/php53-dbase.rb
:100644 100644 669a6fdb5171bd0d09e5cae740cc5700daa9ddb0 59890e76bd24bb82688c48ce6a6e8808cc173649 M Formula/php53-geoip.rb
:100644 100644 17d3eb10ece85e527d83feed27a720c8963924a2 2637528efd976cd5b6634270245575b558987cb6 M Formula/php53-intl.rb
:100644 100644 698ba9d160afe0bbd20fa331d762f0f2ad1c0605 9e40d277c53705acc5f95b2c1fa7f4f4b7f54079 M Formula/php53-ioncubeloader.rb
:100644 100644 071df9c0bc990a3e36a6c47d2594093ce206cfa8 8b73f19ef55efb80685dd12070ae109e26bd7323 M Formula/php53-libevent.rb
:100644 100644 d2202387cea6ab1fed7f9f004c80f6cc12fd3448 1ff5fb96894398f38d81645bdc948664dfe428b7 M Formula/php53-libvirt.rb
:100644 100644 bc650d13e183b6e1519665ee3936b4e4b9962b16 99f1a4dfa6cefa013b4273b2c71479afe82c2a90 M Formula/php53-lzf.rb
:100644 100644 c06c1337ee68831086494c960c13299a9d116d09 de8df6db3d4b841d95e61a9206734148f423bde5 M Formula/php53-mcrypt.rb
:100644 100644 8b5510971c3caa8c26af1e7b055917440ea47699 c26c2724da39abd4a323143d59c2c9f2a9ada22e M Formula/php53-memcached.rb
:100644 100644 e4ccc030e8e6e3fea0bfaf50964de701b439e9ae 1b1d33c9e2f4696052cac31b992940d0f9398ec0 M Formula/php53-midgard2.rb
:100644 100644 63748e325271901a13d5e710f17b1ac26a11c5af 2b0ad578729713a8aa95714893828e84292a3c89 M Formula/php53-pcntl.rb
:100644 100644 60b9040251694d3d7738d9f5cf651afdbd776b2b bd63c70ceb1ebf1971224205e98907157ca19b71 M Formula/php53-phalcon.rb
:100644 100644 ae56d4fa73302c8a162e3b7fd78f951926f0812e 9818a21d390265e3b3d1921c78e34440840ccd8e M Formula/php53-pspell.rb
:100644 100644 cd782d414ece0a4ddfbf7eb2235debdd8bb37e94 bd7af1f310188229549054ee6431d350fbeeb01a M Formula/php53-redis.rb
:100644 100644 fc86d70016777af91c782348342aeca11e7bd841 0ced22cb168650fc8fddd5f53971f20f0bfa8910 M Formula/php53-timezonedb.rb
:100644 100644 821310cb4efade2193853558f0e71451e71c4d7c d46f057c0eaa9319476ad18a55c213579a3a8de7 M Formula/php53-tokyotyrant.rb
:100644 100644 ca4062a9a77f4197ca047a98816f1c01e5a03fc1 de5754b7df0097b076ce99bfe35cffb7a7fb0f17 M Formula/php53-twig.rb
:100644 100644 0ec48463e1e008e9f224e270b014a3f931333817 3df1c9d7396d44b269fea8f3e162189c07c2c2da M Formula/php53-xhprof.rb
:100644 100644 cb8f68c19d8c78e306e9182b07f1c3d753f5f091 515f08874df027d85fa92734882ef3c65ede3cc5 M Formula/php53.rb
:100644 100644 d949a2521ae100ac9ea5e72088cec998ff5fd749 d82870eff9248868b9277dad77f8cd437f144b59 M Formula/php54-dbase.rb
:100644 100644 18ae290757358d90ff18b6c88c39a4929589aeb7 920dc84dcfcc17b798ade39d767c085b5c66abdb M Formula/php54-geoip.rb
:100644 100644 7b6dd176a9a4564d2daec9d6794179d3cac1ffc6 d3cc8ab2262afb472fd6f6cd6e65ccb9473b1806 M Formula/php54-intl.rb
:100644 100644 f07ca4ebb2ed1fda2166468f706f3c9c6bd9bcee 8dc1267904c98e772d691efedea478d3876a0e2b M Formula/php54-ioncubeloader.rb
:100644 100644 266954a5f701d9808b8acf966a00f8a65eccb4f2 86e7316a032e820695715beb082b6bd31283668c M Formula/php54-libevent.rb
:100644 100644 ba23c93e13cb67cdcf9d171b681bd1d6204e229a 0940990cbcdb4d8642dcfcf9c1d59d578e770e9d M Formula/php54-lzf.rb
:100644 100644 fe2ec7aef4f55b849019b4c34264af3ee2cf2408 d86e6e01a58e1ee152488edb0fee540c4180474f M Formula/php54-mcrypt.rb
:100644 100644 0c639fdec378d6afb5e0bb70f13f1b8de608bbf3 8dbe392494d4975f69aa2dc05f33cf1515a4fe18 M Formula/php54-memcached.rb
:100644 100644 43db45c01f33fd74047488aacfb27b57ea6328f7 99010cae96746b2a6f70df361cd7d4bfda54a440 M Formula/php54-midgard2.rb
:100644 100644 7cba1ffd273f38bec29bcf024aa213eff0a70875 99121065d8a77eacc315bf81b77c3354bb976b46 M Formula/php54-pcntl.rb
:100644 100644 d6cf1679abe6295bf2e9f0907c1b842d2672b767 f4e9139764ee40ad4e818e454ba86c7766acd163 M Formula/php54-phalcon.rb
:100644 100644 458d251175328cec5fa197c71a8a0b8715720f42 05c3ac2fb219963bc5f25d441c975d84210c69cb M Formula/php54-pspell.rb
:100644 100644 0837ace743a21cb676961c60e4caca3a176cb577 0cd5c94dc525d37231fa7ae830cfbc9e35dab3b7 M Formula/php54-redis.rb
:100644 100644 d84bddb9f77d3bc07f9459faa7069fb79ffdc020 6ffbf593a2c4a5ce30127d6eae5fee3424664a57 M Formula/php54-timezonedb.rb
:100644 100644 35a7d5dc5699f99c167fdcf8cf4c8a9e31822f9a 74c0d2e2b5f36c69af92591947842e23f9f49efc M Formula/php54-tokyotyrant.rb
:100644 100644 1c9f4aaa4508503c992864f44e6b9507ce23a6de 77f57a82496f70112729d9c1bc8e96cc3e994fef M Formula/php54-twig.rb
:100755 100755 2a76b51f5f9175c3359c422b5fd39cc933c78015 b13820d31f171aca2420e771bb44ca289629cf81 M Formula/php54.rb
:100644 100644 7cb2d801ec3c33509775571761cf147dd2248fae 1ac40906b6beaa54dd2b841819f9056aaa4199dd M README.md
git checkout -q master
==> git rev-parse -q --verify HEAD
973697f15776c639abcad9aca1dfa2e3760a5d9b
git config core.autocrlf false
git pull origin refs/heads/master:refs/remotes/origin/master
Already up-to-date.
==> git rev-parse -q --verify HEAD
973697f15776c639abcad9aca1dfa2e3760a5d9b
Updated Homebrew from 1c82a6a1 to 71854910.
==> New Formulae
libarchive rpm
==> Updated Formulae
arangodb josegonzalez/php/php54-lzf
easy-tag josegonzalez/php/php54-mcrypt
elixir josegonzalez/php/php54-memcached
fop josegonzalez/php/php54-midgard2
gmp josegonzalez/php/php54-pcntl
go josegonzalez/php/php54-phalcon
hbase josegonzalez/php/php54-pspell
httrack josegonzalez/php/php54-redis
ios-webkit-debug-proxy josegonzalez/php/php54-timezonedb
jetty josegonzalez/php/php54-tokyotyrant
josegonzalez/php/abstract-php josegonzalez/php/php54-twig
josegonzalez/php/php53 lame
josegonzalez/php/php53-dbase libgpg-error
josegonzalez/php/php53-geoip libksba
josegonzalez/php/php53-intl libogg
josegonzalez/php/php53-ioncubeloader libslax
josegonzalez/php/php53-libevent libvorbis
josegonzalez/php/php53-libvirt macvim
josegonzalez/php/php53-lzf mu
josegonzalez/php/php53-mcrypt mysql-connector-odbc
josegonzalez/php/php53-memcached open-ocd
josegonzalez/php/php53-midgard2 pixman
josegonzalez/php/php53-pcntl pv
josegonzalez/php/php53-phalcon qt
josegonzalez/php/php53-pspell rdup
josegonzalez/php/php53-redis shocco
josegonzalez/php/php53-timezonedb signing-party
josegonzalez/php/php53-tokyotyrant sleuthkit
josegonzalez/php/php53-twig solr
josegonzalez/php/php53-xhprof spdylay
josegonzalez/php/php54 squid
josegonzalez/php/php54-dbase vert.x
josegonzalez/php/php54-geoip vim
josegonzalez/php/php54-intl xctool
josegonzalez/php/php54-ioncubeloader youtube-dl
josegonzalez/php/php54-libevent
==> Deleted Formulae
bigloo homebrew/dupes/libarchive
コメント