undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stash: don't show internal implementation details

Browse Source 
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>
This commit is contained in:
Thomas Gummerer 2017-03-21 22:12:17 +00:00 committed by Junio C Hamano
parent 9e140909f6
commit 1790f4fea0
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
git-stash.sh
View File

@ -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
}

2
t/t3903-stash.sh
View File

@ -663,7 +663,7 @@ test_expect_success 'stash apply shows status same as git status (relative to cu
sane_unset GIT_MERGE_VERBOSITY &&
git stash apply
) |
sed -e 1,2d >actual && # drop "Saved..." and "HEAD is now..."
sed -e 1d >actual && # drop "Saved..."
test_i18ncmp expect actual
'