diff options
| author | Mike McQuaid | 2016-07-12 19:45:49 +0100 |
|---|---|---|
| committer | GitHub | 2016-07-12 19:45:49 +0100 |
| commit | ed1d1e51da6bf464d6e461f5214e49f17b1f1842 (patch) | |
| tree | 4f706060438c63a539eb74856552934c169da8b2 /Library | |
| parent | 0d189fae57bad6c209b471eba9e0b254a2b40886 (diff) | |
| download | brew-ed1d1e51da6bf464d6e461f5214e49f17b1f1842.tar.bz2 | |
update.sh: improve verbose output and readability. (#486)
Would have made it easier to debug
https://github.com/Homebrew/homebrew-core/issues/2804 where wasn't clear which
directory was causing the issue.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/cmd/update.sh | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Library/Homebrew/cmd/update.sh b/Library/Homebrew/cmd/update.sh index eebab3691..6423a028c 100644 --- a/Library/Homebrew/cmd/update.sh +++ b/Library/Homebrew/cmd/update.sh @@ -107,9 +107,8 @@ pop_stash() { [[ -z "$STASHED" ]] && return if [[ -n "$HOMEBREW_VERBOSE" ]] then + echo "Restoring your stashed changes to $DIR..." git stash pop - echo "Restoring your stashed changes to $DIR:" - git status --short --untracked-files else git stash pop "${QUIET_ARGS[@]}" 1>/dev/null fi @@ -147,6 +146,11 @@ reset_on_interrupt() { } pull() { + if [[ -n "$HOMEBREW_VERBOSE" ]] + then + echo "Updating $DIR..." + fi + local DIR local TAP_VAR @@ -187,8 +191,7 @@ pull() { then if [[ -n "$HOMEBREW_VERBOSE" ]] then - echo "Stashing uncommitted changes to $DIR." - git status --short --untracked-files=all + echo "Stashing uncommitted changes to $DIR..." fi git merge --abort &>/dev/null git rebase --abort &>/dev/null @@ -417,6 +420,7 @@ EOS do [[ -d "$DIR/.git" ]] || continue pull "$DIR" + [[ -n "$HOMEBREW_VERBOSE" ]] && echo done safe_cd "$HOMEBREW_REPOSITORY" |