Commit 1790f4fe authored by Thomas Gummerer's avatar Thomas Gummerer Committed by Junio C Hamano

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: default avatarJeff King <[email protected]>
Signed-off-by: default avatarThomas Gummerer <[email protected]>
Reviewed-by: default avatarJeff King <[email protected]>
Signed-off-by: default avatarJunio C Hamano <[email protected]>
parent 9e140909
......@@ -299,12 +299,12 @@ push_stash () {
then
if test $# != 0
then
git reset ${GIT_QUIET:+-q} -- "[email protected]"
git reset -q -- "[email protected]"
git ls-files -z --modified -- "[email protected]" |
git checkout-index -z --force --stdin
git clean --force ${GIT_QUIET:+-q} -d -- "[email protected]"
git clean --force -q -d -- "[email protected]"
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
}
......
......@@ -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
'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment