aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew
diff options
context:
space:
mode:
authorilovezfs2016-06-05 06:27:58 -0700
committerilovezfs2016-06-05 07:55:35 -0700
commit2cd81e50513f96a657454031e52fa4aec773ea97 (patch)
tree1ad041aa7d8910c63525e60886297ed2ea423507 /Library/Homebrew
parent14657443ce4346254ede3df52670c5e641796cd4 (diff)
downloadbrew-2cd81e50513f96a657454031e52fa4aec773ea97.tar.bz2
update: pop the stash more quietly
git stash pop -q will print "Already up-to-date!" if untracked changes are being poppped. This quiets it down unless verbose is set. Closes #320. Signed-off-by: ilovezfs <ilovezfs@icloud.com>
Diffstat (limited to 'Library/Homebrew')
-rw-r--r--Library/Homebrew/cmd/update.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/Library/Homebrew/cmd/update.sh b/Library/Homebrew/cmd/update.sh
index 54f4f9517..80f49b64d 100644
--- a/Library/Homebrew/cmd/update.sh
+++ b/Library/Homebrew/cmd/update.sh
@@ -95,11 +95,13 @@ read_current_revision() {
pop_stash() {
[[ -z "$STASHED" ]] && return
- git stash pop "${QUIET_ARGS[@]}"
if [[ -n "$HOMEBREW_VERBOSE" ]]
then
+ 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
unset STASHED
}