Skip to content
Snippets Groups Projects
Commit ed1d1e51 authored by Mike McQuaid's avatar Mike McQuaid Committed by GitHub
Browse files

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.
parent 0d189fae
No related branches found
No related tags found
No related merge requests found
......@@ -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"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment