Brew: Broken repo after brew/core split

Created on 4 Apr 2016  Â·  16Comments  Â·  Source: Homebrew/brew

During an attempt to update my own copy of the Homebrew repository after it was split in two upstream and I ran brew update -vd to reflect this change, I was presented with the following output upon running git -C $(brew --repository) push -v…: 

Pushing to https://github.com/RandomDSdevel/homebrew.git
To https://github.com/RandomDSdevel/homebrew.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'https://github.com/RandomDSdevel/homebrew.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

…and git -C $(brew --repository) pull -v RandomDSdevel, …: 

From https://github.com/RandomDSdevel/homebrew
 = [up to date]      master     -> RandomDSdevel/master
Auto-merging share/man/man1/brew.1
CONFLICT (add/add): Merge conflict in share/man/man1/brew.1
[etc, ad nauseum; gist: https://gist.github.com/tdsmith/69cc90ab0914014e8e0ab8c9b2c9f266]

…, respectively. Even after running the following commands…:

  • sudo chown -Rv $(whoami) /usr/local
  • sudo chmod -R +a "zadmin allow delete,readattr,writeattr,readextattr,writeextattr,readsecurity,writesecurity,list,search,add_file,add_subdirectory,delete_child,read,write,append,execute,file_inherit,directory_inherit" /usr/local
  • sudo chmod -R +a "bryce allow delete,readattr,writeattr,readextattr,writeextattr,readsecurityritesecurity,list,search,add_file,add_subdirectory,delete_child,read,write,append,execute,file_inherit,directory_inherit" /usr/local
  • sudo chmod -R +a "_developer allow delete,readattr,writeattr,readextattr,writeextattr,readsecurity,writesecurity,list,search,add_file,add_subdirectory,delete_child,read,write,append,execute,file_inherit,directory_inherit" /usr/local

…in an attempt to remedy any permissions errors I might be having that might have made things worse, I _still_ got errors while trying to push and pull from my Homebrew fork, though, this time, they were _different:_ for git -C $(brew --repository) push -v, I got this, …: 

/usr/local/Library/brew.sh: line 1: syntax error near unexpected token `<<<'
/usr/local/Library/brew.sh: line 1: `<<<<<<< HEAD'
fatal: Cannot change to 'push': No such file or directory

…, whereas for git -C $(brew --repository) pull -v RandomDSdevel, I got this: 

/usr/local/Library/brew.sh: line 1: `<<<<<<< HEAD'
fatal: Cannot change to 'pull': No such file or directory

When trying to run brew update -vd, I got this: 

/usr/local/Library/brew.sh: line 1: syntax error near unexpected token `<<<'
/usr/local/Library/brew.sh: line 1: `<<<<<<< HEAD'

Essentially, I _think_ I just completely messed up my Homebrew install! I'm not entirely sure what to do to fix it, so can you guys help me fix it, please?

picture RandomDSdevel

All 16 comments

Does cd /usr/local; git reset --hard origin/master; brew update work?

tdsmith picture tdsmith on 4 Apr 2016

Let me check…OK, here's what happened when I did what you suggested: 

Bryces-HD-1-TB:~ zadmin$ cd /usr/local
Bryces-HD-1-TB:local zadmin$ git reset --hard origin/master
error: 'Library/Aliases' appears as both a file and as a directory
error: Library/Aliases: cannot drop to stage #0
Checking out files: 100% (4089/4089), done.
HEAD is now at fa3c55a utils/analytics: fix usage of undefined variable.
Bryces-HD-1-TB:local zadmin$ brew update -vd
++ [[ /usr/local = \/\u\s\r\/\l\o\c\a\l ]]
++ [[ ! -w /usr/local ]]
++ [[ ! -w /usr/local ]]
++ git --version
++ export GIT_TERMINAL_PROMPT=0
++ GIT_TERMINAL_PROMPT=0
++ export GIT_ASKPASS=false
++ GIT_ASKPASS=false
++ export 'GIT_SSH_COMMAND=ssh -oBatchMode=yes'
++ GIT_SSH_COMMAND='ssh -oBatchMode=yes'
++ [[ -z 1 ]]
++ QUIET_ARGS=()
++ unset GIT_CONFIG
++ chdir /usr/local
++ cd /usr/local
++ git_init_if_necessary
++ [[ -n 1 ]]
++ OFFICIAL_REMOTE=https://github.com/Homebrew/brew.git
++ [[ ! -d .git ]]
++ rename_taps_dir_if_necessary
++ local tap_dir
++ local tap_dir_basename
++ local user
++ local repo
++ for tap_dir in '"$HOMEBREW_LIBRARY"/Taps/*'
++ [[ -d /usr/local/Library/Taps/caskroom/.git ]]
++ continue
++ for tap_dir in '"$HOMEBREW_LIBRARY"/Taps/*'
++ [[ -d /usr/local/Library/Taps/homebrew/.git ]]
++ continue
++ trap '{ pkill -P $$; wait; exit 130; }' SIGINT
++ for DIR in '"$HOMEBREW_REPOSITORY"' '"$HOMEBREW_LIBRARY"/Taps/*/*'
++ [[ -d /usr/local/.git ]]
++ [[ -n '' ]]
++ cd /usr/local
+++ upstream_branch
+++ local upstream_branch
++++ git symbolic-ref refs/remotes/origin/HEAD
+++ upstream_branch=
+++ upstream_branch=
+++ [[ -z '' ]]
+++ upstream_branch=master
+++ echo master
++ UPSTREAM_BRANCH=master
++ for DIR in '"$HOMEBREW_REPOSITORY"' '"$HOMEBREW_LIBRARY"/Taps/*/*'
++ [[ -d /usr/local/Library/Taps/caskroom/homebrew-cask/.git ]]
++ [[ -n '' ]]
++ cd /usr/local/Library/Taps/caskroom/homebrew-cask
+++ upstream_branch
+++ git config remote.origin.url
+++ local upstream_branch
+++ /usr/local/Library/ENV/scm/git config remote.origin.url
++++ git symbolic-ref refs/remotes/origin/HEAD
++ UPSTREAM_REPOSITORY_URL=https://github.com/Homebrew/brew.git
++ [[ https://github.com/Homebrew/brew.git = \h\t\t\p\s\:\/\/\g\i\t\h\u\b\.\c\o\m\/* ]]
++ UPSTREAM_REPOSITORY=Homebrew/brew.git
++ UPSTREAM_REPOSITORY=Homebrew/brew
+++ git rev-parse refs/remotes/origin/master
+++ /usr/local/Library/ENV/scm/git rev-parse refs/remotes/origin/master
+++ upstream_branch=refs/remotes/origin/master
+++ upstream_branch=master
+++ [[ -z master ]]
+++ echo master
++ UPSTREAM_BRANCH=master
++ for DIR in '"$HOMEBREW_REPOSITORY"' '"$HOMEBREW_LIBRARY"/Taps/*/*'
++ [[ -d /usr/local/Library/Taps/caskroom/homebrew-versions/.git ]]
+++ git config remote.origin.url
+++ /usr/local/Library/ENV/scm/git config remote.origin.url
++ UPSTREAM_BRANCH_LOCAL_SHA=fa3c55aa650e815ce548e1276845171def2847f4
+++ curl --silent --max-time 3 --output /dev/null --write-out '%{http_code}' --user-agent 'Homebrew/0.9.9 (Macintosh; Intel Mac OS X 10.11.4) curl/7.43.0' --header 'Accept: application/vnd.github.chitauri-preview+sha' --header 'If-None-Match: "fa3c55aa650e815ce548e1276845171def2847f4"' https://api.github.com/repos/Homebrew/brew/commits/master
++ [[ -n '' ]]
++ cd /usr/local/Library/Taps/caskroom/homebrew-versions
+++ upstream_branch
+++ local upstream_branch
++++ git symbolic-ref refs/remotes/origin/HEAD
++ UPSTREAM_REPOSITORY_URL=https://github.com/caskroom/homebrew-cask
++ [[ https://github.com/caskroom/homebrew-cask = \h\t\t\p\s\:\/\/\g\i\t\h\u\b\.\c\o\m\/* ]]
++ UPSTREAM_REPOSITORY=caskroom/homebrew-cask
++ UPSTREAM_REPOSITORY=caskroom/homebrew-cask
+++ git rev-parse refs/remotes/origin/master
+++ /usr/local/Library/ENV/scm/git rev-parse refs/remotes/origin/master
+++ upstream_branch=refs/remotes/origin/master
+++ upstream_branch=master
+++ [[ -z master ]]
+++ echo master
++ UPSTREAM_BRANCH=master
++ for DIR in '"$HOMEBREW_REPOSITORY"' '"$HOMEBREW_LIBRARY"/Taps/*/*'
++ [[ -d /usr/local/Library/Taps/homebrew/homebrew-apache/.git ]]
+++ git config remote.origin.url
+++ /usr/local/Library/ENV/scm/git config remote.origin.url
++ [[ -n '' ]]
++ cd /usr/local/Library/Taps/homebrew/homebrew-apache
+++ upstream_branch
+++ local upstream_branch
++++ git symbolic-ref refs/remotes/origin/HEAD
++ UPSTREAM_BRANCH_LOCAL_SHA=8a89363c7772b4ffc09250c643bafb15af7b3ddb
+++ curl --silent --max-time 3 --output /dev/null --write-out '%{http_code}' --user-agent 'Homebrew/0.9.9 (Macintosh; Intel Mac OS X 10.11.4) curl/7.43.0' --header 'Accept: application/vnd.github.chitauri-preview+sha' --header 'If-None-Match: "8a89363c7772b4ffc09250c643bafb15af7b3ddb"' https://api.github.com/repos/caskroom/homebrew-cask/commits/master
++ UPSTREAM_REPOSITORY_URL=https://github.com/caskroom/homebrew-versions
++ [[ https://github.com/caskroom/homebrew-versions = \h\t\t\p\s\:\/\/\g\i\t\h\u\b\.\c\o\m\/* ]]
++ UPSTREAM_REPOSITORY=caskroom/homebrew-versions
++ UPSTREAM_REPOSITORY=caskroom/homebrew-versions
+++ git rev-parse refs/remotes/origin/master
+++ /usr/local/Library/ENV/scm/git rev-parse refs/remotes/origin/master
++ UPSTREAM_BRANCH_LOCAL_SHA=0df50018f046637b2d8d39051dc6ee347a85cb93
+++ curl --silent --max-time 3 --output /dev/null --write-out '%{http_code}' --user-agent 'Homebrew/0.9.9 (Macintosh; Intel Mac OS X 10.11.4) curl/7.43.0' --header 'Accept: application/vnd.github.chitauri-preview+sha' --header 'If-None-Match: "0df50018f046637b2d8d39051dc6ee347a85cb93"' https://api.github.com/repos/caskroom/homebrew-versions/commits/master
+++ upstream_branch=refs/remotes/origin/master
+++ upstream_branch=master
+++ [[ -z master ]]
+++ echo master
++ UPSTREAM_BRANCH=master
++ for DIR in '"$HOMEBREW_REPOSITORY"' '"$HOMEBREW_LIBRARY"/Taps/*/*'
++ [[ -d /usr/local/Library/Taps/homebrew/homebrew-boneyard/.git ]]
++ [[ -n '' ]]
++ cd /usr/local/Library/Taps/homebrew/homebrew-boneyard
+++ git config remote.origin.url
+++ /usr/local/Library/ENV/scm/git config remote.origin.url
+++ upstream_branch
+++ local upstream_branch
++++ git symbolic-ref refs/remotes/origin/HEAD
++ UPSTREAM_REPOSITORY_URL=https://github.com/Homebrew/homebrew-apache
++ [[ https://github.com/Homebrew/homebrew-apache = \h\t\t\p\s\:\/\/\g\i\t\h\u\b\.\c\o\m\/* ]]
++ UPSTREAM_REPOSITORY=Homebrew/homebrew-apache
++ UPSTREAM_REPOSITORY=Homebrew/homebrew-apache
+++ git rev-parse refs/remotes/origin/master
+++ /usr/local/Library/ENV/scm/git rev-parse refs/remotes/origin/master
++ UPSTREAM_SHA_HTTP_CODE=304
++ [[ 304 = \3\0\4 ]]
++ exit
++ UPSTREAM_BRANCH_LOCAL_SHA=0ee1dd9012f506897ef75ca6f2a559d19576d709
+++ curl --silent --max-time 3 --output /dev/null --write-out '%{http_code}' --user-agent 'Homebrew/0.9.9 (Macintosh; Intel Mac OS X 10.11.4) curl/7.43.0' --header 'Accept: application/vnd.github.chitauri-preview+sha' --header 'If-None-Match: "0ee1dd9012f506897ef75ca6f2a559d19576d709"' https://api.github.com/repos/Homebrew/homebrew-apache/commits/master
+++ upstream_branch=refs/remotes/origin/master
+++ upstream_branch=master
+++ [[ -z master ]]
+++ echo master
++ UPSTREAM_BRANCH=master
++ UPSTREAM_SHA_HTTP_CODE=200
++ [[ 200 = \3\0\4 ]]
++ git fetch --force origin refs/heads/master:refs/remotes/origin/master
++ /usr/local/Library/ENV/scm/git fetch --force origin refs/heads/master:refs/remotes/origin/master
++ for DIR in '"$HOMEBREW_REPOSITORY"' '"$HOMEBREW_LIBRARY"/Taps/*/*'
++ [[ -d /usr/local/Library/Taps/homebrew/homebrew-core/.git ]]
++ [[ -n '' ]]
++ cd /usr/local/Library/Taps/homebrew/homebrew-core
+++ upstream_branch
+++ local upstream_branch
+++ git config remote.origin.url
+++ /usr/local/Library/ENV/scm/git config remote.origin.url
++++ git symbolic-ref refs/remotes/origin/HEAD
++ UPSTREAM_SHA_HTTP_CODE=304
++ [[ 304 = \3\0\4 ]]
++ exit
++ UPSTREAM_REPOSITORY_URL=https://github.com/Homebrew/homebrew-boneyard
++ [[ https://github.com/Homebrew/homebrew-boneyard = \h\t\t\p\s\:\/\/\g\i\t\h\u\b\.\c\o\m\/* ]]
++ UPSTREAM_REPOSITORY=Homebrew/homebrew-boneyard
++ UPSTREAM_REPOSITORY=Homebrew/homebrew-boneyard
+++ git rev-parse refs/remotes/origin/master
+++ /usr/local/Library/ENV/scm/git rev-parse refs/remotes/origin/master
+++ upstream_branch=refs/remotes/origin/master
+++ upstream_branch=master
+++ [[ -z master ]]
+++ echo master
++ UPSTREAM_BRANCH=master
++ for DIR in '"$HOMEBREW_REPOSITORY"' '"$HOMEBREW_LIBRARY"/Taps/*/*'
++ [[ -d /usr/local/Library/Taps/homebrew/homebrew-dupes/.git ]]
+++ git config remote.origin.url
+++ /usr/local/Library/ENV/scm/git config remote.origin.url
++ UPSTREAM_BRANCH_LOCAL_SHA=affe08558438419eb8765e76f011f4278aea10ea
+++ curl --silent --max-time 3 --output /dev/null --write-out '%{http_code}' --user-agent 'Homebrew/0.9.9 (Macintosh; Intel Mac OS X 10.11.4) curl/7.43.0' --header 'Accept: application/vnd.github.chitauri-preview+sha' --header 'If-None-Match: "affe08558438419eb8765e76f011f4278aea10ea"' https://api.github.com/repos/Homebrew/homebrew-boneyard/commits/master
++ [[ -n '' ]]
++ cd /usr/local/Library/Taps/homebrew/homebrew-dupes
+++ upstream_branch
+++ local upstream_branch
++++ git symbolic-ref refs/remotes/origin/HEAD
++ UPSTREAM_REPOSITORY_URL=https://github.com/Homebrew/homebrew-core
++ [[ https://github.com/Homebrew/homebrew-core = \h\t\t\p\s\:\/\/\g\i\t\h\u\b\.\c\o\m\/* ]]
++ UPSTREAM_REPOSITORY=Homebrew/homebrew-core
++ UPSTREAM_REPOSITORY=Homebrew/homebrew-core
+++ git rev-parse refs/remotes/origin/master
+++ /usr/local/Library/ENV/scm/git rev-parse refs/remotes/origin/master
++ UPSTREAM_SHA_HTTP_CODE=304
++ [[ 304 = \3\0\4 ]]
++ exit
++ UPSTREAM_BRANCH_LOCAL_SHA=30d907f65f70db8f6845a18f2f9fafa6bbbbf900
+++ curl --silent --max-time 3 --output /dev/null --write-out '%{http_code}' --user-agent 'Homebrew/0.9.9 (Macintosh; Intel Mac OS X 10.11.4) curl/7.43.0' --header 'Accept: application/vnd.github.chitauri-preview+sha' --header 'If-None-Match: "30d907f65f70db8f6845a18f2f9fafa6bbbbf900"' https://api.github.com/repos/Homebrew/homebrew-core/commits/master
+++ upstream_branch=refs/remotes/origin/master
+++ upstream_branch=master
+++ [[ -z master ]]
+++ echo master
++ UPSTREAM_BRANCH=master
++ for DIR in '"$HOMEBREW_REPOSITORY"' '"$HOMEBREW_LIBRARY"/Taps/*/*'
++ [[ -d /usr/local/Library/Taps/homebrew/homebrew-php/.git ]]
++ [[ -n '' ]]
++ cd /usr/local/Library/Taps/homebrew/homebrew-php
+++ upstream_branch
+++ local upstream_branch
+++ git config remote.origin.url
+++ /usr/local/Library/ENV/scm/git config remote.origin.url
++++ git symbolic-ref refs/remotes/origin/HEAD
++ UPSTREAM_REPOSITORY_URL=https://github.com/Homebrew/homebrew-dupes
++ [[ https://github.com/Homebrew/homebrew-dupes = \h\t\t\p\s\:\/\/\g\i\t\h\u\b\.\c\o\m\/* ]]
++ UPSTREAM_REPOSITORY=Homebrew/homebrew-dupes
++ UPSTREAM_REPOSITORY=Homebrew/homebrew-dupes
+++ git rev-parse refs/remotes/origin/master
+++ /usr/local/Library/ENV/scm/git rev-parse refs/remotes/origin/master
++ UPSTREAM_SHA_HTTP_CODE=304
++ [[ 304 = \3\0\4 ]]
++ exit
++ UPSTREAM_BRANCH_LOCAL_SHA=ed82adaa71c1550fb66d4ffaffeaa65d4e433314
+++ curl --silent --max-time 3 --output /dev/null --write-out '%{http_code}' --user-agent 'Homebrew/0.9.9 (Macintosh; Intel Mac OS X 10.11.4) curl/7.43.0' --header 'Accept: application/vnd.github.chitauri-preview+sha' --header 'If-None-Match: "ed82adaa71c1550fb66d4ffaffeaa65d4e433314"' https://api.github.com/repos/Homebrew/homebrew-dupes/commits/master
+++ upstream_branch=refs/remotes/origin/master
+++ upstream_branch=master
+++ [[ -z master ]]
+++ echo master
++ UPSTREAM_BRANCH=master
++ for DIR in '"$HOMEBREW_REPOSITORY"' '"$HOMEBREW_LIBRARY"/Taps/*/*'
++ [[ -d /usr/local/Library/Taps/homebrew/homebrew-services/.git ]]
+++ git config remote.origin.url
+++ /usr/local/Library/ENV/scm/git config remote.origin.url
++ [[ -n '' ]]
++ cd /usr/local/Library/Taps/homebrew/homebrew-services
+++ upstream_branch
+++ local upstream_branch
++++ git symbolic-ref refs/remotes/origin/HEAD
++ UPSTREAM_REPOSITORY_URL=https://github.com/Homebrew/homebrew-php
++ [[ https://github.com/Homebrew/homebrew-php = \h\t\t\p\s\:\/\/\g\i\t\h\u\b\.\c\o\m\/* ]]
++ UPSTREAM_REPOSITORY=Homebrew/homebrew-php
++ UPSTREAM_REPOSITORY=Homebrew/homebrew-php
+++ git rev-parse refs/remotes/origin/master
+++ /usr/local/Library/ENV/scm/git rev-parse refs/remotes/origin/master
++ UPSTREAM_SHA_HTTP_CODE=200
++ [[ 200 = \3\0\4 ]]
++ git fetch --force origin refs/heads/master:refs/remotes/origin/master
++ /usr/local/Library/ENV/scm/git fetch --force origin refs/heads/master:refs/remotes/origin/master
++ UPSTREAM_BRANCH_LOCAL_SHA=fc62caccf59a7a6cacbe386d0225872f6a4f0a29
+++ curl --silent --max-time 3 --output /dev/null --write-out '%{http_code}' --user-agent 'Homebrew/0.9.9 (Macintosh; Intel Mac OS X 10.11.4) curl/7.43.0' --header 'Accept: application/vnd.github.chitauri-preview+sha' --header 'If-None-Match: "fc62caccf59a7a6cacbe386d0225872f6a4f0a29"' https://api.github.com/repos/Homebrew/homebrew-php/commits/master
+++ upstream_branch=refs/remotes/origin/master
+++ upstream_branch=master
+++ [[ -z master ]]
+++ echo master
++ UPSTREAM_BRANCH=master
++ wait
+++ git config remote.origin.url
+++ /usr/local/Library/ENV/scm/git config remote.origin.url
++ UPSTREAM_REPOSITORY_URL=https://github.com/Homebrew/homebrew-services
++ [[ https://github.com/Homebrew/homebrew-services = \h\t\t\p\s\:\/\/\g\i\t\h\u\b\.\c\o\m\/* ]]
++ UPSTREAM_REPOSITORY=Homebrew/homebrew-services
++ UPSTREAM_REPOSITORY=Homebrew/homebrew-services
+++ git rev-parse refs/remotes/origin/master
+++ /usr/local/Library/ENV/scm/git rev-parse refs/remotes/origin/master
++ UPSTREAM_SHA_HTTP_CODE=304
++ [[ 304 = \3\0\4 ]]
++ exit
++ UPSTREAM_BRANCH_LOCAL_SHA=d47ae5f6856bd1fae94d40a578358cadc20f00bf
+++ curl --silent --max-time 3 --output /dev/null --write-out '%{http_code}' --user-agent 'Homebrew/0.9.9 (Macintosh; Intel Mac OS X 10.11.4) curl/7.43.0' --header 'Accept: application/vnd.github.chitauri-preview+sha' --header 'If-None-Match: "d47ae5f6856bd1fae94d40a578358cadc20f00bf"' https://api.github.com/repos/Homebrew/homebrew-services/commits/master
++ UPSTREAM_SHA_HTTP_CODE=304
++ [[ 304 = \3\0\4 ]]
++ exit
++ UPSTREAM_SHA_HTTP_CODE=304
++ [[ 304 = \3\0\4 ]]
++ exit
remote: Counting objects: 8, done.
remote: Compressing objects: 100% (5/5), done.
remote: Total 8 (delta 6), reused 5 (delta 3), pack-reused 0
Unpacking objects: 100% (8/8), done.
From https://github.com/Homebrew/homebrew-core
   30d907f..bfca446  master     -> origin/master
remote: Counting objects: 9, done.
remote: Compressing objects: 100% (6/6), done.
remote: Total 9 (delta 6), reused 6 (delta 3), pack-reused 0
Unpacking objects: 100% (9/9), done.
From https://github.com/caskroom/homebrew-cask
   8a89363..88004db  master     -> origin/master
++ trap - SIGINT
++ for DIR in '"$HOMEBREW_REPOSITORY"' '"$HOMEBREW_LIBRARY"/Taps/*/*'
++ [[ -d /usr/local/.git ]]
++ pull /usr/local
++ local DIR
++ local TAP_VAR
++ DIR=/usr/local
++ cd /usr/local
+++ repo_var /usr/local
+++ local repo_var
+++ repo_var=/usr/local
+++ [[ /usr/local = \/\u\s\r\/\l\o\c\a\l ]]
+++ repo_var=
+++ echo ''
++ TAP_VAR=
++ unset STASHED
+++ git symbolic-ref --short HEAD
++ INITIAL_BRANCH=master
+++ upstream_branch
+++ local upstream_branch
++++ git symbolic-ref refs/remotes/origin/HEAD
+++ upstream_branch=
+++ upstream_branch=
+++ [[ -z '' ]]
+++ upstream_branch=master
+++ echo master
++ UPSTREAM_BRANCH=master
++ [[ -n '' ]]
++ trap reset_on_interrupt SIGINT
+++ git status --untracked-files=all --porcelain
++ [[ -n  U Library/Formula
 U Library/Homebrew/README.md
 U Library/Homebrew/blacklist.rb
 U Library/Homebrew/cmd/audit.rb
 U Library/Homebrew/cmd/config.rb
 U Library/Homebrew/cmd/create.rb
 U Library/Homebrew/cmd/help.rb
 U Library/Homebrew/cmd/prune.rb
 U Library/Homebrew/cmd/pull.rb
 U Library/Homebrew/cmd/readall.rb
 U Library/Homebrew/cmd/tap-info.rb
 U Library/Homebrew/cmd/tap-pin.rb
 U Library/Homebrew/cmd/tap-readme.rb
 U Library/Homebrew/cmd/tap-unpin.rb
 U Library/Homebrew/cmd/tap.rb
 U Library/Homebrew/cmd/test-bot.rb
 U Library/Homebrew/cmd/untap.rb
 U Library/Homebrew/cmd/update-report.rb
 U Library/Homebrew/cmd/update.sh
 U Library/Homebrew/descriptions.rb
 U Library/Homebrew/dev-cmd/update-test.rb
 U Library/Homebrew/diagnostic.rb
 U Library/Homebrew/exceptions.rb
 U Library/Homebrew/extend/pathname.rb
 U Library/Homebrew/formula.rb
 U Library/Homebrew/formula_installer.rb
 U Library/Homebrew/formulary.rb
 U Library/Homebrew/global.rb
 U Library/Homebrew/manpages/brew.1.md
 U Library/Homebrew/os.rb
 U Library/Homebrew/os/mac.rb
 U Library/Homebrew/os/mac/xcode.rb
 U Library/Homebrew/tab.rb
 U Library/Homebrew/tap.rb
 U Library/Homebrew/test/fixtures/receipt.json
 U Library/Homebrew/test/fixtures/updater_fixture.yaml
 U Library/Homebrew/test/test_cmd_info.rb
 U Library/Homebrew/test/test_formula.rb
 U Library/Homebrew/test/test_formulary.rb
 U Library/Homebrew/test/test_integration_cmds.rb
 U Library/Homebrew/test/test_pathname.rb
 U Library/Homebrew/test/test_tab.rb
 U Library/Homebrew/test/test_tap.rb
 U Library/Homebrew/test/test_update_report.rb
 U Library/Homebrew/test/testing_env.rb
 U Library/Homebrew/utils.rb
 U Library/Homebrew/utils/git.rb
 U Library/brew.rb
 U Library/brew.sh
AU README.md
 U share/doc/homebrew/Acceptable-Formulae.md
 U share/doc/homebrew/Brew-Test-Bot-For-Core-Contributors.md
 U share/doc/homebrew/Brew-Test-Bot.md
 U share/doc/homebrew/Common-Issues.md
 U share/doc/homebrew/External-Commands.md
 U share/doc/homebrew/FAQ.md
 U share/doc/homebrew/Formula-Cookbook.md
 U share/doc/homebrew/How-To-Open-a-Homebrew-Pull-Request-(and-get-it-merged).md
 U share/doc/homebrew/Installation.md
 U share/doc/homebrew/Interesting-Taps-&-Branches.md
 U share/doc/homebrew/Migrating-A-Formula-To-A-Tap.md
 U share/doc/homebrew/New-Maintainer-Checklist.md
 U share/doc/homebrew/Querying-Brew.md
 U share/doc/homebrew/Rename-A-Formula.md
 U share/doc/homebrew/Tips-N'-Tricks.md
 U share/doc/homebrew/Troubleshooting.md
 U share/doc/homebrew/brew-tap.md
 U share/doc/homebrew/brew.1.html
 U share/man/man1/brew.1
?? Library/Aliases~HEAD
?? Library/Formula~HEAD ]]
++ [[ -n 1 ]]
++ echo 'Stashing uncommitted changes to /usr/local.'
Stashing uncommitted changes to /usr/local.
++ git status --short --untracked-files=all
++ /usr/local/Library/ENV/scm/git status --short --untracked-files=all
 U Library/Formula
 U Library/Homebrew/README.md
 U Library/Homebrew/blacklist.rb
 U Library/Homebrew/cmd/audit.rb
 U Library/Homebrew/cmd/config.rb
 U Library/Homebrew/cmd/create.rb
 U Library/Homebrew/cmd/help.rb
 U Library/Homebrew/cmd/prune.rb
 U Library/Homebrew/cmd/pull.rb
 U Library/Homebrew/cmd/readall.rb
 U Library/Homebrew/cmd/tap-info.rb
 U Library/Homebrew/cmd/tap-pin.rb
 U Library/Homebrew/cmd/tap-readme.rb
 U Library/Homebrew/cmd/tap-unpin.rb
 U Library/Homebrew/cmd/tap.rb
 U Library/Homebrew/cmd/test-bot.rb
 U Library/Homebrew/cmd/untap.rb
 U Library/Homebrew/cmd/update-report.rb
 U Library/Homebrew/cmd/update.sh
 U Library/Homebrew/descriptions.rb
 U Library/Homebrew/dev-cmd/update-test.rb
 U Library/Homebrew/diagnostic.rb
 U Library/Homebrew/exceptions.rb
 U Library/Homebrew/extend/pathname.rb
 U Library/Homebrew/formula.rb
 U Library/Homebrew/formula_installer.rb
 U Library/Homebrew/formulary.rb
 U Library/Homebrew/global.rb
 U Library/Homebrew/manpages/brew.1.md
 U Library/Homebrew/os.rb
 U Library/Homebrew/os/mac.rb
 U Library/Homebrew/os/mac/xcode.rb
 U Library/Homebrew/tab.rb
 U Library/Homebrew/tap.rb
 U Library/Homebrew/test/fixtures/receipt.json
 U Library/Homebrew/test/fixtures/updater_fixture.yaml
 U Library/Homebrew/test/test_cmd_info.rb
 U Library/Homebrew/test/test_formula.rb
 U Library/Homebrew/test/test_formulary.rb
 U Library/Homebrew/test/test_integration_cmds.rb
 U Library/Homebrew/test/test_pathname.rb
 U Library/Homebrew/test/test_tab.rb
 U Library/Homebrew/test/test_tap.rb
 U Library/Homebrew/test/test_update_report.rb
 U Library/Homebrew/test/testing_env.rb
 U Library/Homebrew/utils.rb
 U Library/Homebrew/utils/git.rb
 U Library/brew.rb
 U Library/brew.sh
AU README.md
 U share/doc/homebrew/Acceptable-Formulae.md
 U share/doc/homebrew/Brew-Test-Bot-For-Core-Contributors.md
 U share/doc/homebrew/Brew-Test-Bot.md
 U share/doc/homebrew/Common-Issues.md
 U share/doc/homebrew/External-Commands.md
 U share/doc/homebrew/FAQ.md
 U share/doc/homebrew/Formula-Cookbook.md
 U share/doc/homebrew/How-To-Open-a-Homebrew-Pull-Request-(and-get-it-merged).md
 U share/doc/homebrew/Installation.md
 U share/doc/homebrew/Interesting-Taps-&-Branches.md
 U share/doc/homebrew/Migrating-A-Formula-To-A-Tap.md
 U share/doc/homebrew/New-Maintainer-Checklist.md
 U share/doc/homebrew/Querying-Brew.md
 U share/doc/homebrew/Rename-A-Formula.md
 U share/doc/homebrew/Tips-N'-Tricks.md
 U share/doc/homebrew/Troubleshooting.md
 U share/doc/homebrew/brew-tap.md
 U share/doc/homebrew/brew.1.html
 U share/man/man1/brew.1
?? Library/Aliases~HEAD
?? Library/Formula~HEAD
++ git merge --abort
++ git -c user.email=brew-update@localhost -c 'user.name=brew update' stash save --include-untracked
++ /usr/local/Library/ENV/scm/git -c user.email=brew-update@localhost -c 'user.name=brew update' stash save --include-untracked
Library/Formula: needs merge
Library/Homebrew/README.md: needs merge
Library/Homebrew/blacklist.rb: needs merge
Library/Homebrew/cmd/audit.rb: needs merge
Library/Homebrew/cmd/config.rb: needs merge
Library/Homebrew/cmd/create.rb: needs merge
Library/Homebrew/cmd/help.rb: needs merge
Library/Homebrew/cmd/prune.rb: needs merge
Library/Homebrew/cmd/pull.rb: needs merge
Library/Homebrew/cmd/readall.rb: needs merge
Library/Homebrew/cmd/tap-info.rb: needs merge
Library/Homebrew/cmd/tap-pin.rb: needs merge
Library/Homebrew/cmd/tap-readme.rb: needs merge
Library/Homebrew/cmd/tap-unpin.rb: needs merge
Library/Homebrew/cmd/tap.rb: needs merge
Library/Homebrew/cmd/test-bot.rb: needs merge
Library/Homebrew/cmd/untap.rb: needs merge
Library/Homebrew/cmd/update-report.rb: needs merge
Library/Homebrew/cmd/update.sh: needs merge
Library/Homebrew/descriptions.rb: needs merge
Library/Homebrew/dev-cmd/update-test.rb: needs merge
Library/Homebrew/diagnostic.rb: needs merge
Library/Homebrew/exceptions.rb: needs merge
Library/Homebrew/extend/pathname.rb: needs merge
Library/Homebrew/formula.rb: needs merge
Library/Homebrew/formula_installer.rb: needs merge
Library/Homebrew/formulary.rb: needs merge
Library/Homebrew/global.rb: needs merge
Library/Homebrew/manpages/brew.1.md: needs merge
Library/Homebrew/os.rb: needs merge
Library/Homebrew/os/mac.rb: needs merge
Library/Homebrew/os/mac/xcode.rb: needs merge
Library/Homebrew/tab.rb: needs merge
Library/Homebrew/tap.rb: needs merge
Library/Homebrew/test/fixtures/receipt.json: needs merge
Library/Homebrew/test/fixtures/updater_fixture.yaml: needs merge
Library/Homebrew/test/test_cmd_info.rb: needs merge
Library/Homebrew/test/test_formula.rb: needs merge
Library/Homebrew/test/test_formulary.rb: needs merge
Library/Homebrew/test/test_integration_cmds.rb: needs merge
Library/Homebrew/test/test_pathname.rb: needs merge
Library/Homebrew/test/test_tab.rb: needs merge
Library/Homebrew/test/test_tap.rb: needs merge
Library/Homebrew/test/test_update_report.rb: needs merge
Library/Homebrew/test/testing_env.rb: needs merge
Library/Homebrew/utils.rb: needs merge
Library/Homebrew/utils/git.rb: needs merge
Library/brew.rb: needs merge
Library/brew.sh: needs merge
README.md: needs merge
share/doc/homebrew/Acceptable-Formulae.md: needs merge
share/doc/homebrew/Brew-Test-Bot-For-Core-Contributors.md: needs merge
share/doc/homebrew/Brew-Test-Bot.md: needs merge
share/doc/homebrew/Common-Issues.md: needs merge
share/doc/homebrew/External-Commands.md: needs merge
share/doc/homebrew/FAQ.md: needs merge
share/doc/homebrew/Formula-Cookbook.md: needs merge
share/doc/homebrew/How-To-Open-a-Homebrew-Pull-Request-(and-get-it-merged).md: needs merge
share/doc/homebrew/Installation.md: needs merge
share/doc/homebrew/Interesting-Taps-&-Branches.md: needs merge
share/doc/homebrew/Migrating-A-Formula-To-A-Tap.md: needs merge
share/doc/homebrew/New-Maintainer-Checklist.md: needs merge
share/doc/homebrew/Querying-Brew.md: needs merge
share/doc/homebrew/Rename-A-Formula.md: needs merge
share/doc/homebrew/Tips-N'-Tricks.md: needs merge
share/doc/homebrew/Troubleshooting.md: needs merge
share/doc/homebrew/brew-tap.md: needs merge
share/doc/homebrew/brew.1.html: needs merge
share/man/man1/brew.1: needs merge
Library/Formula: needs merge
Library/Homebrew/README.md: needs merge
Library/Homebrew/blacklist.rb: needs merge
Library/Homebrew/cmd/audit.rb: needs merge
Library/Homebrew/cmd/config.rb: needs merge
Library/Homebrew/cmd/create.rb: needs merge
Library/Homebrew/cmd/help.rb: needs merge
Library/Homebrew/cmd/prune.rb: needs merge
Library/Homebrew/cmd/pull.rb: needs merge
Library/Homebrew/cmd/readall.rb: needs merge
Library/Homebrew/cmd/tap-info.rb: needs merge
Library/Homebrew/cmd/tap-pin.rb: needs merge
Library/Homebrew/cmd/tap-readme.rb: needs merge
Library/Homebrew/cmd/tap-unpin.rb: needs merge
Library/Homebrew/cmd/tap.rb: needs merge
Library/Homebrew/cmd/test-bot.rb: needs merge
Library/Homebrew/cmd/untap.rb: needs merge
Library/Homebrew/cmd/update-report.rb: needs merge
Library/Homebrew/cmd/update.sh: needs merge
Library/Homebrew/descriptions.rb: needs merge
Library/Homebrew/dev-cmd/update-test.rb: needs merge
Library/Homebrew/diagnostic.rb: needs merge
Library/Homebrew/exceptions.rb: needs merge
Library/Homebrew/extend/pathname.rb: needs merge
Library/Homebrew/formula.rb: needs merge
Library/Homebrew/formula_installer.rb: needs merge
Library/Homebrew/formulary.rb: needs merge
Library/Homebrew/global.rb: needs merge
Library/Homebrew/manpages/brew.1.md: needs merge
Library/Homebrew/os.rb: needs merge
Library/Homebrew/os/mac.rb: needs merge
Library/Homebrew/os/mac/xcode.rb: needs merge
Library/Homebrew/tab.rb: needs merge
Library/Homebrew/tap.rb: needs merge
Library/Homebrew/test/fixtures/receipt.json: needs merge
Library/Homebrew/test/fixtures/updater_fixture.yaml: needs merge
Library/Homebrew/test/test_cmd_info.rb: needs merge
Library/Homebrew/test/test_formula.rb: needs merge
Library/Homebrew/test/test_formulary.rb: needs merge
Library/Homebrew/test/test_integration_cmds.rb: needs merge
Library/Homebrew/test/test_pathname.rb: needs merge
Library/Homebrew/test/test_tab.rb: needs merge
Library/Homebrew/test/test_tap.rb: needs merge
Library/Homebrew/test/test_update_report.rb: needs merge
Library/Homebrew/test/testing_env.rb: needs merge
Library/Homebrew/utils.rb: needs merge
Library/Homebrew/utils/git.rb: needs merge
Library/brew.rb: needs merge
Library/brew.sh: needs merge
README.md: needs merge
share/doc/homebrew/Acceptable-Formulae.md: needs merge
share/doc/homebrew/Brew-Test-Bot-For-Core-Contributors.md: needs merge
share/doc/homebrew/Brew-Test-Bot.md: needs merge
share/doc/homebrew/Common-Issues.md: needs merge
share/doc/homebrew/External-Commands.md: needs merge
share/doc/homebrew/FAQ.md: needs merge
share/doc/homebrew/Formula-Cookbook.md: needs merge
share/doc/homebrew/How-To-Open-a-Homebrew-Pull-Request-(and-get-it-merged).md: needs merge
share/doc/homebrew/Installation.md: needs merge
share/doc/homebrew/Interesting-Taps-&-Branches.md: needs merge
share/doc/homebrew/Migrating-A-Formula-To-A-Tap.md: needs merge
share/doc/homebrew/New-Maintainer-Checklist.md: needs merge
share/doc/homebrew/Querying-Brew.md: needs merge
share/doc/homebrew/Rename-A-Formula.md: needs merge
share/doc/homebrew/Tips-N'-Tricks.md: needs merge
share/doc/homebrew/Troubleshooting.md: needs merge
share/doc/homebrew/brew-tap.md: needs merge
share/doc/homebrew/brew.1.html: needs merge
share/man/man1/brew.1: needs merge
fatal: You need to resolve your current index first
Cannot save the current worktree state
++ git reset --hard
++ /usr/local/Library/ENV/scm/git reset --hard
HEAD is now at fa3c55a utils/analytics: fix usage of undefined variable.
++ STASHED=1
++ [[ master != \m\a\s\t\e\r ]]
+++ read_current_revision
+++ git rev-parse -q --verify HEAD
+++ /usr/local/Library/ENV/scm/git rev-parse -q --verify HEAD
++ INITIAL_REVISION=fa3c55aa650e815ce548e1276845171def2847f4
++ export HOMEBREW_UPDATE_BEFORE=fa3c55aa650e815ce548e1276845171def2847f4
++ HOMEBREW_UPDATE_BEFORE=fa3c55aa650e815ce548e1276845171def2847f4
++ git config core.autocrlf false
++ /usr/local/Library/ENV/scm/git config core.autocrlf false
++ [[ -n '' ]]
++ git merge --no-edit --ff origin/master --strategy=recursive --strategy-option=ours --strategy-option=ignore-all-space
++ /usr/local/Library/ENV/scm/git merge --no-edit --ff origin/master --strategy=recursive --strategy-option=ours --strategy-option=ignore-all-space
Already up-to-date.
+++ read_current_revision
+++ git rev-parse -q --verify HEAD
+++ /usr/local/Library/ENV/scm/git rev-parse -q --verify HEAD
++ export HOMEBREW_UPDATE_AFTER=fa3c55aa650e815ce548e1276845171def2847f4
++ HOMEBREW_UPDATE_AFTER=fa3c55aa650e815ce548e1276845171def2847f4
++ trap '' SIGINT
++ pop_stash_message
++ [[ -z 1 ]]
++ echo 'To restore the stashed changes to /usr/local run:'
To restore the stashed changes to /usr/local run:
++ echo '  '\''cd /usr/local && git stash pop'\'''
  'cd /usr/local && git stash pop'
++ unset STASHED
++ trap - SIGINT
++ for DIR in '"$HOMEBREW_REPOSITORY"' '"$HOMEBREW_LIBRARY"/Taps/*/*'
++ [[ -d /usr/local/Library/Taps/caskroom/homebrew-cask/.git ]]
++ pull /usr/local/Library/Taps/caskroom/homebrew-cask
++ local DIR
++ local TAP_VAR
++ DIR=/usr/local/Library/Taps/caskroom/homebrew-cask
++ cd /usr/local/Library/Taps/caskroom/homebrew-cask
+++ repo_var /usr/local/Library/Taps/caskroom/homebrew-cask
+++ local repo_var
+++ repo_var=/usr/local/Library/Taps/caskroom/homebrew-cask
+++ [[ /usr/local/Library/Taps/caskroom/homebrew-cask = \/\u\s\r\/\l\o\c\a\l ]]
+++ repo_var=/caskroom/homebrew-cask
++++ echo -n /caskroom/homebrew-cask
++++ tr -C A-Za-z0-9 _
++++ tr '[:lower:]' '[:upper:]'
+++ repo_var=_CASKROOM_HOMEBREW_CASK
+++ echo _CASKROOM_HOMEBREW_CASK
++ TAP_VAR=_CASKROOM_HOMEBREW_CASK
++ unset STASHED
+++ git symbolic-ref --short HEAD
++ INITIAL_BRANCH=master
+++ upstream_branch
+++ local upstream_branch
++++ git symbolic-ref refs/remotes/origin/HEAD
+++ upstream_branch=refs/remotes/origin/master
+++ upstream_branch=master
+++ [[ -z master ]]
+++ echo master
++ UPSTREAM_BRANCH=master
++ [[ -n '' ]]
++ trap reset_on_interrupt SIGINT
+++ git status --untracked-files=all --porcelain
++ [[ -n '' ]]
++ [[ master != \m\a\s\t\e\r ]]
+++ read_current_revision
+++ git rev-parse -q --verify HEAD
+++ /usr/local/Library/ENV/scm/git rev-parse -q --verify HEAD
++ INITIAL_REVISION=8a89363c7772b4ffc09250c643bafb15af7b3ddb
++ export HOMEBREW_UPDATE_BEFORE_CASKROOM_HOMEBREW_CASK=8a89363c7772b4ffc09250c643bafb15af7b3ddb
++ HOMEBREW_UPDATE_BEFORE_CASKROOM_HOMEBREW_CASK=8a89363c7772b4ffc09250c643bafb15af7b3ddb
++ git config core.autocrlf false
++ /usr/local/Library/ENV/scm/git config core.autocrlf false
++ [[ -n '' ]]
++ git merge --no-edit --ff origin/master --strategy=recursive --strategy-option=ours --strategy-option=ignore-all-space
++ /usr/local/Library/ENV/scm/git merge --no-edit --ff origin/master --strategy=recursive --strategy-option=ours --strategy-option=ignore-all-space
Updating 8a89363..88004db
Fast-forward
 Casks/radiant-player.rb          | 6 +++---
 doc/development/adding_a_cask.md | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
+++ read_current_revision
+++ git rev-parse -q --verify HEAD
+++ /usr/local/Library/ENV/scm/git rev-parse -q --verify HEAD
++ export HOMEBREW_UPDATE_AFTER_CASKROOM_HOMEBREW_CASK=88004dba16ef716c80389f7a0527fddf269e939c
++ HOMEBREW_UPDATE_AFTER_CASKROOM_HOMEBREW_CASK=88004dba16ef716c80389f7a0527fddf269e939c
++ trap '' SIGINT
++ pop_stash_message
++ [[ -z '' ]]
++ return
++ trap - SIGINT
++ for DIR in '"$HOMEBREW_REPOSITORY"' '"$HOMEBREW_LIBRARY"/Taps/*/*'
++ [[ -d /usr/local/Library/Taps/caskroom/homebrew-versions/.git ]]
++ pull /usr/local/Library/Taps/caskroom/homebrew-versions
++ local DIR
++ local TAP_VAR
++ DIR=/usr/local/Library/Taps/caskroom/homebrew-versions
++ cd /usr/local/Library/Taps/caskroom/homebrew-versions
+++ repo_var /usr/local/Library/Taps/caskroom/homebrew-versions
+++ local repo_var
+++ repo_var=/usr/local/Library/Taps/caskroom/homebrew-versions
+++ [[ /usr/local/Library/Taps/caskroom/homebrew-versions = \/\u\s\r\/\l\o\c\a\l ]]
+++ repo_var=/caskroom/homebrew-versions
++++ echo -n /caskroom/homebrew-versions
++++ tr -C A-Za-z0-9 _
++++ tr '[:lower:]' '[:upper:]'
+++ repo_var=_CASKROOM_HOMEBREW_VERSIONS
+++ echo _CASKROOM_HOMEBREW_VERSIONS
++ TAP_VAR=_CASKROOM_HOMEBREW_VERSIONS
++ unset STASHED
+++ git symbolic-ref --short HEAD
++ INITIAL_BRANCH=master
+++ upstream_branch
+++ local upstream_branch
++++ git symbolic-ref refs/remotes/origin/HEAD
+++ upstream_branch=refs/remotes/origin/master
+++ upstream_branch=master
+++ [[ -z master ]]
+++ echo master
++ UPSTREAM_BRANCH=master
++ [[ -n '' ]]
++ trap reset_on_interrupt SIGINT
+++ git status --untracked-files=all --porcelain
++ [[ -n '' ]]
++ [[ master != \m\a\s\t\e\r ]]
+++ read_current_revision
+++ git rev-parse -q --verify HEAD
+++ /usr/local/Library/ENV/scm/git rev-parse -q --verify HEAD
++ INITIAL_REVISION=0df50018f046637b2d8d39051dc6ee347a85cb93
++ export HOMEBREW_UPDATE_BEFORE_CASKROOM_HOMEBREW_VERSIONS=0df50018f046637b2d8d39051dc6ee347a85cb93
++ HOMEBREW_UPDATE_BEFORE_CASKROOM_HOMEBREW_VERSIONS=0df50018f046637b2d8d39051dc6ee347a85cb93
++ git config core.autocrlf false
++ /usr/local/Library/ENV/scm/git config core.autocrlf false
++ [[ -n '' ]]
++ git merge --no-edit --ff origin/master --strategy=recursive --strategy-option=ours --strategy-option=ignore-all-space
++ /usr/local/Library/ENV/scm/git merge --no-edit --ff origin/master --strategy=recursive --strategy-option=ours --strategy-option=ignore-all-space
Already up-to-date.
+++ read_current_revision
+++ git rev-parse -q --verify HEAD
+++ /usr/local/Library/ENV/scm/git rev-parse -q --verify HEAD
++ export HOMEBREW_UPDATE_AFTER_CASKROOM_HOMEBREW_VERSIONS=0df50018f046637b2d8d39051dc6ee347a85cb93
++ HOMEBREW_UPDATE_AFTER_CASKROOM_HOMEBREW_VERSIONS=0df50018f046637b2d8d39051dc6ee347a85cb93
++ trap '' SIGINT
++ pop_stash_message
++ [[ -z '' ]]
++ return
++ trap - SIGINT
++ for DIR in '"$HOMEBREW_REPOSITORY"' '"$HOMEBREW_LIBRARY"/Taps/*/*'
++ [[ -d /usr/local/Library/Taps/homebrew/homebrew-apache/.git ]]
++ pull /usr/local/Library/Taps/homebrew/homebrew-apache
++ local DIR
++ local TAP_VAR
++ DIR=/usr/local/Library/Taps/homebrew/homebrew-apache
++ cd /usr/local/Library/Taps/homebrew/homebrew-apache
+++ repo_var /usr/local/Library/Taps/homebrew/homebrew-apache
+++ local repo_var
+++ repo_var=/usr/local/Library/Taps/homebrew/homebrew-apache
+++ [[ /usr/local/Library/Taps/homebrew/homebrew-apache = \/\u\s\r\/\l\o\c\a\l ]]
+++ repo_var=/homebrew/homebrew-apache
++++ echo -n /homebrew/homebrew-apache
++++ tr -C A-Za-z0-9 _
++++ tr '[:lower:]' '[:upper:]'
+++ repo_var=_HOMEBREW_HOMEBREW_APACHE
+++ echo _HOMEBREW_HOMEBREW_APACHE
++ TAP_VAR=_HOMEBREW_HOMEBREW_APACHE
++ unset STASHED
+++ git symbolic-ref --short HEAD
++ INITIAL_BRANCH=master
+++ upstream_branch
+++ local upstream_branch
++++ git symbolic-ref refs/remotes/origin/HEAD
+++ upstream_branch=refs/remotes/origin/master
+++ upstream_branch=master
+++ [[ -z master ]]
+++ echo master
++ UPSTREAM_BRANCH=master
++ [[ -n '' ]]
++ trap reset_on_interrupt SIGINT
+++ git status --untracked-files=all --porcelain
++ [[ -n '' ]]
++ [[ master != \m\a\s\t\e\r ]]
+++ read_current_revision
+++ git rev-parse -q --verify HEAD
+++ /usr/local/Library/ENV/scm/git rev-parse -q --verify HEAD
++ INITIAL_REVISION=0ee1dd9012f506897ef75ca6f2a559d19576d709
++ export HOMEBREW_UPDATE_BEFORE_HOMEBREW_HOMEBREW_APACHE=0ee1dd9012f506897ef75ca6f2a559d19576d709
++ HOMEBREW_UPDATE_BEFORE_HOMEBREW_HOMEBREW_APACHE=0ee1dd9012f506897ef75ca6f2a559d19576d709
++ git config core.autocrlf false
++ /usr/local/Library/ENV/scm/git config core.autocrlf false
++ [[ -n '' ]]
++ git merge --no-edit --ff origin/master --strategy=recursive --strategy-option=ours --strategy-option=ignore-all-space
++ /usr/local/Library/ENV/scm/git merge --no-edit --ff origin/master --strategy=recursive --strategy-option=ours --strategy-option=ignore-all-space
Already up-to-date.
+++ read_current_revision
+++ git rev-parse -q --verify HEAD
+++ /usr/local/Library/ENV/scm/git rev-parse -q --verify HEAD
++ export HOMEBREW_UPDATE_AFTER_HOMEBREW_HOMEBREW_APACHE=0ee1dd9012f506897ef75ca6f2a559d19576d709
++ HOMEBREW_UPDATE_AFTER_HOMEBREW_HOMEBREW_APACHE=0ee1dd9012f506897ef75ca6f2a559d19576d709
++ trap '' SIGINT
++ pop_stash_message
++ [[ -z '' ]]
++ return
++ trap - SIGINT
++ for DIR in '"$HOMEBREW_REPOSITORY"' '"$HOMEBREW_LIBRARY"/Taps/*/*'
++ [[ -d /usr/local/Library/Taps/homebrew/homebrew-boneyard/.git ]]
++ pull /usr/local/Library/Taps/homebrew/homebrew-boneyard
++ local DIR
++ local TAP_VAR
++ DIR=/usr/local/Library/Taps/homebrew/homebrew-boneyard
++ cd /usr/local/Library/Taps/homebrew/homebrew-boneyard
+++ repo_var /usr/local/Library/Taps/homebrew/homebrew-boneyard
+++ local repo_var
+++ repo_var=/usr/local/Library/Taps/homebrew/homebrew-boneyard
+++ [[ /usr/local/Library/Taps/homebrew/homebrew-boneyard = \/\u\s\r\/\l\o\c\a\l ]]
+++ repo_var=/homebrew/homebrew-boneyard
++++ echo -n /homebrew/homebrew-boneyard
++++ tr -C A-Za-z0-9 _
++++ tr '[:lower:]' '[:upper:]'
+++ repo_var=_HOMEBREW_HOMEBREW_BONEYARD
+++ echo _HOMEBREW_HOMEBREW_BONEYARD
++ TAP_VAR=_HOMEBREW_HOMEBREW_BONEYARD
++ unset STASHED
+++ git symbolic-ref --short HEAD
++ INITIAL_BRANCH=master
+++ upstream_branch
+++ local upstream_branch
++++ git symbolic-ref refs/remotes/origin/HEAD
+++ upstream_branch=refs/remotes/origin/master
+++ upstream_branch=master
+++ [[ -z master ]]
+++ echo master
++ UPSTREAM_BRANCH=master
++ [[ -n '' ]]
++ trap reset_on_interrupt SIGINT
+++ git status --untracked-files=all --porcelain
++ [[ -n '' ]]
++ [[ master != \m\a\s\t\e\r ]]
+++ read_current_revision
+++ git rev-parse -q --verify HEAD
+++ /usr/local/Library/ENV/scm/git rev-parse -q --verify HEAD
++ INITIAL_REVISION=affe08558438419eb8765e76f011f4278aea10ea
++ export HOMEBREW_UPDATE_BEFORE_HOMEBREW_HOMEBREW_BONEYARD=affe08558438419eb8765e76f011f4278aea10ea
++ HOMEBREW_UPDATE_BEFORE_HOMEBREW_HOMEBREW_BONEYARD=affe08558438419eb8765e76f011f4278aea10ea
++ git config core.autocrlf false
++ /usr/local/Library/ENV/scm/git config core.autocrlf false
++ [[ -n '' ]]
++ git merge --no-edit --ff origin/master --strategy=recursive --strategy-option=ours --strategy-option=ignore-all-space
++ /usr/local/Library/ENV/scm/git merge --no-edit --ff origin/master --strategy=recursive --strategy-option=ours --strategy-option=ignore-all-space
Already up-to-date.
+++ read_current_revision
+++ git rev-parse -q --verify HEAD
+++ /usr/local/Library/ENV/scm/git rev-parse -q --verify HEAD
++ export HOMEBREW_UPDATE_AFTER_HOMEBREW_HOMEBREW_BONEYARD=affe08558438419eb8765e76f011f4278aea10ea
++ HOMEBREW_UPDATE_AFTER_HOMEBREW_HOMEBREW_BONEYARD=affe08558438419eb8765e76f011f4278aea10ea
++ trap '' SIGINT
++ pop_stash_message
++ [[ -z '' ]]
++ return
++ trap - SIGINT
++ for DIR in '"$HOMEBREW_REPOSITORY"' '"$HOMEBREW_LIBRARY"/Taps/*/*'
++ [[ -d /usr/local/Library/Taps/homebrew/homebrew-core/.git ]]
++ pull /usr/local/Library/Taps/homebrew/homebrew-core
++ local DIR
++ local TAP_VAR
++ DIR=/usr/local/Library/Taps/homebrew/homebrew-core
++ cd /usr/local/Library/Taps/homebrew/homebrew-core
+++ repo_var /usr/local/Library/Taps/homebrew/homebrew-core
+++ local repo_var
+++ repo_var=/usr/local/Library/Taps/homebrew/homebrew-core
+++ [[ /usr/local/Library/Taps/homebrew/homebrew-core = \/\u\s\r\/\l\o\c\a\l ]]
+++ repo_var=/homebrew/homebrew-core
++++ echo -n /homebrew/homebrew-core
++++ tr -C A-Za-z0-9 _
++++ tr '[:lower:]' '[:upper:]'
+++ repo_var=_HOMEBREW_HOMEBREW_CORE
+++ echo _HOMEBREW_HOMEBREW_CORE
++ TAP_VAR=_HOMEBREW_HOMEBREW_CORE
++ unset STASHED
+++ git symbolic-ref --short HEAD
++ INITIAL_BRANCH=master
+++ upstream_branch
+++ local upstream_branch
++++ git symbolic-ref refs/remotes/origin/HEAD
+++ upstream_branch=refs/remotes/origin/master
+++ upstream_branch=master
+++ [[ -z master ]]
+++ echo master
++ UPSTREAM_BRANCH=master
++ [[ -n '' ]]
++ trap reset_on_interrupt SIGINT
+++ git status --untracked-files=all --porcelain
++ [[ -n '' ]]
++ [[ master != \m\a\s\t\e\r ]]
+++ read_current_revision
+++ git rev-parse -q --verify HEAD
+++ /usr/local/Library/ENV/scm/git rev-parse -q --verify HEAD
++ INITIAL_REVISION=30d907f65f70db8f6845a18f2f9fafa6bbbbf900
++ export HOMEBREW_UPDATE_BEFORE_HOMEBREW_HOMEBREW_CORE=30d907f65f70db8f6845a18f2f9fafa6bbbbf900
++ HOMEBREW_UPDATE_BEFORE_HOMEBREW_HOMEBREW_CORE=30d907f65f70db8f6845a18f2f9fafa6bbbbf900
++ git config core.autocrlf false
++ /usr/local/Library/ENV/scm/git config core.autocrlf false
++ [[ -n '' ]]
++ git merge --no-edit --ff origin/master --strategy=recursive --strategy-option=ours --strategy-option=ignore-all-space
++ /usr/local/Library/ENV/scm/git merge --no-edit --ff origin/master --strategy=recursive --strategy-option=ours --strategy-option=ignore-all-space
Updating 30d907f..bfca446
Fast-forward
 Formula/fourstore.rb | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)
+++ read_current_revision
+++ git rev-parse -q --verify HEAD
+++ /usr/local/Library/ENV/scm/git rev-parse -q --verify HEAD
++ export HOMEBREW_UPDATE_AFTER_HOMEBREW_HOMEBREW_CORE=bfca446bdedca3df533f1f79a7bb90a402567529
++ HOMEBREW_UPDATE_AFTER_HOMEBREW_HOMEBREW_CORE=bfca446bdedca3df533f1f79a7bb90a402567529
++ trap '' SIGINT
++ pop_stash_message
++ [[ -z '' ]]
++ return
++ trap - SIGINT
++ for DIR in '"$HOMEBREW_REPOSITORY"' '"$HOMEBREW_LIBRARY"/Taps/*/*'
++ [[ -d /usr/local/Library/Taps/homebrew/homebrew-dupes/.git ]]
++ pull /usr/local/Library/Taps/homebrew/homebrew-dupes
++ local DIR
++ local TAP_VAR
++ DIR=/usr/local/Library/Taps/homebrew/homebrew-dupes
++ cd /usr/local/Library/Taps/homebrew/homebrew-dupes
+++ repo_var /usr/local/Library/Taps/homebrew/homebrew-dupes
+++ local repo_var
+++ repo_var=/usr/local/Library/Taps/homebrew/homebrew-dupes
+++ [[ /usr/local/Library/Taps/homebrew/homebrew-dupes = \/\u\s\r\/\l\o\c\a\l ]]
+++ repo_var=/homebrew/homebrew-dupes
++++ echo -n /homebrew/homebrew-dupes
++++ tr -C A-Za-z0-9 _
++++ tr '[:lower:]' '[:upper:]'
+++ repo_var=_HOMEBREW_HOMEBREW_DUPES
+++ echo _HOMEBREW_HOMEBREW_DUPES
++ TAP_VAR=_HOMEBREW_HOMEBREW_DUPES
++ unset STASHED
+++ git symbolic-ref --short HEAD
++ INITIAL_BRANCH=master
+++ upstream_branch
+++ local upstream_branch
++++ git symbolic-ref refs/remotes/origin/HEAD
+++ upstream_branch=refs/remotes/origin/master
+++ upstream_branch=master
+++ [[ -z master ]]
+++ echo master
++ UPSTREAM_BRANCH=master
++ [[ -n '' ]]
++ trap reset_on_interrupt SIGINT
+++ git status --untracked-files=all --porcelain
++ [[ -n '' ]]
++ [[ master != \m\a\s\t\e\r ]]
+++ read_current_revision
+++ git rev-parse -q --verify HEAD
+++ /usr/local/Library/ENV/scm/git rev-parse -q --verify HEAD
++ INITIAL_REVISION=ed82adaa71c1550fb66d4ffaffeaa65d4e433314
++ export HOMEBREW_UPDATE_BEFORE_HOMEBREW_HOMEBREW_DUPES=ed82adaa71c1550fb66d4ffaffeaa65d4e433314
++ HOMEBREW_UPDATE_BEFORE_HOMEBREW_HOMEBREW_DUPES=ed82adaa71c1550fb66d4ffaffeaa65d4e433314
++ git config core.autocrlf false
++ /usr/local/Library/ENV/scm/git config core.autocrlf false
++ [[ -n '' ]]
++ git merge --no-edit --ff origin/master --strategy=recursive --strategy-option=ours --strategy-option=ignore-all-space
++ /usr/local/Library/ENV/scm/git merge --no-edit --ff origin/master --strategy=recursive --strategy-option=ours --strategy-option=ignore-all-space
Already up-to-date.
+++ read_current_revision
+++ git rev-parse -q --verify HEAD
+++ /usr/local/Library/ENV/scm/git rev-parse -q --verify HEAD
++ export HOMEBREW_UPDATE_AFTER_HOMEBREW_HOMEBREW_DUPES=ed82adaa71c1550fb66d4ffaffeaa65d4e433314
++ HOMEBREW_UPDATE_AFTER_HOMEBREW_HOMEBREW_DUPES=ed82adaa71c1550fb66d4ffaffeaa65d4e433314
++ trap '' SIGINT
++ pop_stash_message
++ [[ -z '' ]]
++ return
++ trap - SIGINT
++ for DIR in '"$HOMEBREW_REPOSITORY"' '"$HOMEBREW_LIBRARY"/Taps/*/*'
++ [[ -d /usr/local/Library/Taps/homebrew/homebrew-php/.git ]]
++ pull /usr/local/Library/Taps/homebrew/homebrew-php
++ local DIR
++ local TAP_VAR
++ DIR=/usr/local/Library/Taps/homebrew/homebrew-php
++ cd /usr/local/Library/Taps/homebrew/homebrew-php
+++ repo_var /usr/local/Library/Taps/homebrew/homebrew-php
+++ local repo_var
+++ repo_var=/usr/local/Library/Taps/homebrew/homebrew-php
+++ [[ /usr/local/Library/Taps/homebrew/homebrew-php = \/\u\s\r\/\l\o\c\a\l ]]
+++ repo_var=/homebrew/homebrew-php
++++ echo -n /homebrew/homebrew-php
++++ tr -C A-Za-z0-9 _
++++ tr '[:lower:]' '[:upper:]'
+++ repo_var=_HOMEBREW_HOMEBREW_PHP
+++ echo _HOMEBREW_HOMEBREW_PHP
++ TAP_VAR=_HOMEBREW_HOMEBREW_PHP
++ unset STASHED
+++ git symbolic-ref --short HEAD
++ INITIAL_BRANCH=master
+++ upstream_branch
+++ local upstream_branch
++++ git symbolic-ref refs/remotes/origin/HEAD
+++ upstream_branch=refs/remotes/origin/master
+++ upstream_branch=master
+++ [[ -z master ]]
+++ echo master
++ UPSTREAM_BRANCH=master
++ [[ -n '' ]]
++ trap reset_on_interrupt SIGINT
+++ git status --untracked-files=all --porcelain
++ [[ -n '' ]]
++ [[ master != \m\a\s\t\e\r ]]
+++ read_current_revision
+++ git rev-parse -q --verify HEAD
+++ /usr/local/Library/ENV/scm/git rev-parse -q --verify HEAD
++ INITIAL_REVISION=fc62caccf59a7a6cacbe386d0225872f6a4f0a29
++ export HOMEBREW_UPDATE_BEFORE_HOMEBREW_HOMEBREW_PHP=fc62caccf59a7a6cacbe386d0225872f6a4f0a29
++ HOMEBREW_UPDATE_BEFORE_HOMEBREW_HOMEBREW_PHP=fc62caccf59a7a6cacbe386d0225872f6a4f0a29
++ git config core.autocrlf false
++ /usr/local/Library/ENV/scm/git config core.autocrlf false
++ [[ -n '' ]]
++ git merge --no-edit --ff origin/master --strategy=recursive --strategy-option=ours --strategy-option=ignore-all-space
++ /usr/local/Library/ENV/scm/git merge --no-edit --ff origin/master --strategy=recursive --strategy-option=ours --strategy-option=ignore-all-space
Already up-to-date.
+++ read_current_revision
+++ git rev-parse -q --verify HEAD
+++ /usr/local/Library/ENV/scm/git rev-parse -q --verify HEAD
++ export HOMEBREW_UPDATE_AFTER_HOMEBREW_HOMEBREW_PHP=fc62caccf59a7a6cacbe386d0225872f6a4f0a29
++ HOMEBREW_UPDATE_AFTER_HOMEBREW_HOMEBREW_PHP=fc62caccf59a7a6cacbe386d0225872f6a4f0a29
++ trap '' SIGINT
++ pop_stash_message
++ [[ -z '' ]]
++ return
++ trap - SIGINT
++ for DIR in '"$HOMEBREW_REPOSITORY"' '"$HOMEBREW_LIBRARY"/Taps/*/*'
++ [[ -d /usr/local/Library/Taps/homebrew/homebrew-services/.git ]]
++ pull /usr/local/Library/Taps/homebrew/homebrew-services
++ local DIR
++ local TAP_VAR
++ DIR=/usr/local/Library/Taps/homebrew/homebrew-services
++ cd /usr/local/Library/Taps/homebrew/homebrew-services
+++ repo_var /usr/local/Library/Taps/homebrew/homebrew-services
+++ local repo_var
+++ repo_var=/usr/local/Library/Taps/homebrew/homebrew-services
+++ [[ /usr/local/Library/Taps/homebrew/homebrew-services = \/\u\s\r\/\l\o\c\a\l ]]
+++ repo_var=/homebrew/homebrew-services
++++ echo -n /homebrew/homebrew-services
++++ tr -C A-Za-z0-9 _
++++ tr '[:lower:]' '[:upper:]'
+++ repo_var=_HOMEBREW_HOMEBREW_SERVICES
+++ echo _HOMEBREW_HOMEBREW_SERVICES
++ TAP_VAR=_HOMEBREW_HOMEBREW_SERVICES
++ unset STASHED
+++ git symbolic-ref --short HEAD
++ INITIAL_BRANCH=master
+++ upstream_branch
+++ local upstream_branch
++++ git symbolic-ref refs/remotes/origin/HEAD
+++ upstream_branch=refs/remotes/origin/master
+++ upstream_branch=master
+++ [[ -z master ]]
+++ echo master
++ UPSTREAM_BRANCH=master
++ [[ -n '' ]]
++ trap reset_on_interrupt SIGINT
+++ git status --untracked-files=all --porcelain
++ [[ -n '' ]]
++ [[ master != \m\a\s\t\e\r ]]
+++ read_current_revision
+++ git rev-parse -q --verify HEAD
+++ /usr/local/Library/ENV/scm/git rev-parse -q --verify HEAD
++ INITIAL_REVISION=d47ae5f6856bd1fae94d40a578358cadc20f00bf
++ export HOMEBREW_UPDATE_BEFORE_HOMEBREW_HOMEBREW_SERVICES=d47ae5f6856bd1fae94d40a578358cadc20f00bf
++ HOMEBREW_UPDATE_BEFORE_HOMEBREW_HOMEBREW_SERVICES=d47ae5f6856bd1fae94d40a578358cadc20f00bf
++ git config core.autocrlf false
++ /usr/local/Library/ENV/scm/git config core.autocrlf false
++ [[ -n '' ]]
++ git merge --no-edit --ff origin/master --strategy=recursive --strategy-option=ours --strategy-option=ignore-all-space
++ /usr/local/Library/ENV/scm/git merge --no-edit --ff origin/master --strategy=recursive --strategy-option=ours --strategy-option=ignore-all-space
Already up-to-date.
+++ read_current_revision
+++ git rev-parse -q --verify HEAD
+++ /usr/local/Library/ENV/scm/git rev-parse -q --verify HEAD
++ export HOMEBREW_UPDATE_AFTER_HOMEBREW_HOMEBREW_SERVICES=d47ae5f6856bd1fae94d40a578358cadc20f00bf
++ HOMEBREW_UPDATE_AFTER_HOMEBREW_HOMEBREW_SERVICES=d47ae5f6856bd1fae94d40a578358cadc20f00bf
++ trap '' SIGINT
++ pop_stash_message
++ [[ -z '' ]]
++ return
++ trap - SIGINT
++ chdir /usr/local
++ cd /usr/local
++ brew update-report -vd
++ /usr/local/bin/brew update-report -vd
/usr/local/Library/brew.rb (Formulary::FromPathLoader): loading /usr/local/Library/Taps/homebrew/homebrew-core/Formula/fourstore.rb
/usr/local/Library/brew.rb (Formulary::FormulaContentsLoader): loading /usr/local/Library/Taps/homebrew/homebrew-core/Formula/fourstore.rb
Updated 2 taps (caskroom/cask, homebrew/core).
==> Updated Formulae
fourstore
++ return 0
++ exit 0

In particular, the errors that git rest --hard origin/master spat out and all the untracked files that brew update -vd reported seem like they might be relevant to my situation here.

RandomDSdevel picture RandomDSdevel on 4 Apr 2016

It looks like you might be back in business to me; is anything not working now?

If you try running update again, please don't add -vd; the output is way too verbose.

tdsmith picture tdsmith on 4 Apr 2016

@tdsmith: If it helps, I'm on OS X 'El Capitan' v10.11.4. Also, here's the exact sequence of commands I used before my current problems with Homebrew cropped up and which I believe might be at least partly responsible: 

brew update -vd
cd $(brew --repository)
git branch --list
git branch -dvf CMake__v3_5_1
cd ~
brew update -vd
git -C $(brew --repository) push -v
git -C $(brew --repository) pull -v RandomDSdevel
sudo chown -Rv $(whoami) /usr/local/
sudo chmod -R +a "zadmin allow delete,readattr,writeattr,readextattr,writeextattr,readsecurity,writesecurity,list,search,add_file,add_subdirectory,delete_child,read,write,append,execute,file_inherit,directory_inherit" /usr/local
sudo chmod -R +a "bryce allow delete,readattr,writeattr,readextattr,writeextattr,readsecurity,writesecurity,list,search,add_file,add_subdirectory,delete_child,read,write,append,execute,file_inherit,directory_inherit" /usr/local
sudo chmod -R +a "_developer allow delete,readattr,writeattr,readextattr,writeextattr,readsecurity,writesecurity,list,search,add_file,add_subdirectory,delete_child,read,write,append,execute,file_inherit,directory_inherit" /usr/local
git -C $(brew --repository) push -v
git -C $(brew --repository) pull -v RandomDSdevel
brew update -vd

The stuff having to do with branching and the CMake__v3_5_1 branch was me cleaning up my local machine after Homebrew/legacy-homebrew pull request #50251, 'CMake v3.5.1.'

RandomDSdevel picture RandomDSdevel on 4 Apr 2016

@tdsmith: Well, I'm not exactly sure what to do with my downstream fork of what has become Homebrew/legacy-homebrew. Given the core/formula split, I _think_ I should just configure my local Homebrew install to ignore it, delete it, and start fresh whenever I next need to submit a pull request, but I want to make sure I know what to do (other than remembering not to push to or pull from said old fork) before I attempt that.

P. S.: Here's the output I got from brew update (with neither the -v option nor the -d option, as you requested) when I ran it again: 

To restore the stashed changes to /usr/local run:
  'cd /usr/local && git stash pop'
Already up-to-date.

I take it I can just discard the stash? Other than that, everything does look OK, so thank you.

RandomDSdevel picture RandomDSdevel on 4 Apr 2016

Yeh, you should refork either Homebrew/brew or Homebrew/homebrew-core as desired and then you can git rebase -i your local branches on the new master and push them to your new forks.

MikeMcQuaid picture MikeMcQuaid on 4 Apr 2016
👍1

@mikemcquaid: Thanks for clearing that up. Should we update Homebrew's documentation to let other contributors know that this is the recommended course of action, though? I imagine that I might not end up being the only one getting confused by errors otherwise.

RandomDSdevel picture RandomDSdevel on 4 Apr 2016
👍1

@tdsmith: I decided to run git stash clear to discard my local Homebrew repository clone's stash entries (plural, since it turned out that I had one from an earlier Homebrew mishap) on my own since I thought that this might end up being what you would recommend anyway.

RandomDSdevel picture RandomDSdevel on 4 Apr 2016

:+1:

tdsmith picture tdsmith on 4 Apr 2016

@tdsmith: This is slightly off topic, but to which of my previous comments did you mean your 'thumbs up' emoticon to apply? Since you put it in a separate post instead of applying it to the relevant comment using GitHub's recently added 'Reactions' feature, I can't tell.

RandomDSdevel picture RandomDSdevel on 4 Apr 2016

The most recent one, directed to me.

tdsmith picture tdsmith on 4 Apr 2016

@tdsmith: Ah, thanks.

RandomDSdevel picture RandomDSdevel on 4 Apr 2016

I think there's nothing to follow up on here; glad it's working for you now!

tdsmith picture tdsmith on 5 Apr 2016

@tdsmith: Well, there _was_ that little documentation fix I proposed to @mikemcquaid in this comment, but I should probably just re-submit that as a separate issue (or maybe even a full-fledged pull request if either of you guys can tell me what kind of changes would help prevent others' confusion over problems like mine) now that we're done here.

RandomDSdevel picture RandomDSdevel on 6 Apr 2016

Forgive me if this is a dumb question but is this issue related to this error I'm getting now?

➜  local git:(master) brew update
error: unable to read askpass response from 'false'
fatal: could not read Username for 'https://github.com': terminal prompts disabled
Error: Fetching /usr/local/Library/Taps/nviennot/homebrew-tmate failed!
Already up-to-date.
diversario picture diversario on 7 Apr 2016

@diversario No, this is unrelated. Please open a new issue and try to include a bit more information (what was the behavior in the past, what did you expect to happen, …) so we have a chance to help you.

UniqMartin picture UniqMartin on 7 Apr 2016
❤1
Was this page helpful?
0 / 5 - 0 ratings

Related issues

JustinTArthur picture JustinTArthur  Â·  3Comments
hktalent picture hktalent  Â·  4Comments
zelsonia picture zelsonia  Â·  4Comments
vitahlin picture vitahlin  Â·  4Comments
kirk86 picture kirk86  Â·  3Comments