aboutsummaryrefslogtreecommitdiff
path: root/git-stash.sh
diff options
context:
space:
mode:
authorThomas Gummerer <t.gummerer@gmail.com>2017-03-21 22:12:17 +0000
committerJunio C Hamano <gitster@pobox.com>2017-03-22 14:55:11 -0700
commit1790f4fea04c2401feda0c96e35a3b50b1ba4fe3 (patch)
treeb0444e7b4f67395d451894b7eea9a955111cdf42 /git-stash.sh
parent9e140909f611fff720efc914b7186b8e4ab722cd (diff)
downloadgit-1790f4fea04c2401feda0c96e35a3b50b1ba4fe3.tar.gz
git-1790f4fea04c2401feda0c96e35a3b50b1ba4fe3.tar.xz
stash: don't show internal implementation details
git stash push uses other git commands internally. Currently it only passes the -q flag to those if the -q flag is passed to git stash. when using 'git stash push -p -q --no-keep-index', it doesn't even pass the flag on to the internal reset at all. It really is enough for the user to know that the stash is created, without bothering them with the internal details of what's happening. Always pass the -q flag to the internal git clean and git reset commands, to avoid unnecessary and potentially confusing output. Reported-by: Jeff King <peff@peff.net> Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-stash.sh')
-rwxr-xr-xgit-stash.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/git-stash.sh b/git-stash.sh
index 9c70662cc..ba86d8432 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -299,12 +299,12 @@ push_stash () {
then
if test $# != 0
then
- git reset ${GIT_QUIET:+-q} -- "$@"
+ git reset -q -- "$@"
git ls-files -z --modified -- "$@" |
git checkout-index -z --force --stdin
- git clean --force ${GIT_QUIET:+-q} -d -- "$@"
+ git clean --force -q -d -- "$@"
else
- git reset --hard ${GIT_QUIET:+-q}
+ git reset --hard -q
fi
test "$untracked" = "all" && CLEAN_X_OPTION=-x || CLEAN_X_OPTION=
if test -n "$untracked"
@@ -322,7 +322,7 @@ push_stash () {
if test "$keep_index" != "t"
then
- git reset
+ git reset -q
fi
fi
}