admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

update: pop the stash more quietly

Browse Source 
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>
This commit is contained in:
ilovezfs 2016-06-05 06:27:58 -07:00
parent 14657443ce
commit 2cd81e5051
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/cmd/update.sh
View File

@ -95,11 +95,13 @@ read_current_revision() {
pop_stash() { pop_stash() {
[[ -z "$STASHED" ]] && return [[ -z "$STASHED" ]] && return
git stash pop "${QUIET_ARGS[@]}"
if [[ -n "$HOMEBREW_VERBOSE" ]] if [[ -n "$HOMEBREW_VERBOSE" ]]
then then
git stash pop
echo "Restoring your stashed changes to $DIR:" echo "Restoring your stashed changes to $DIR:"
git status --short --untracked-files git status --short --untracked-files
else
git stash pop "${QUIET_ARGS[@]}" 1>/dev/null
fi fi
unset STASHED unset STASHED
} }