summaryrefslogtreecommitdiff
path: root/t/t4000-diff-format.sh
diff options
context:
space:
mode:
authorLibravatar Victoria Dye <vdye@github.com>2022-03-15 01:49:42 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-03-14 18:51:56 -0700
commit4b8b0f6fa2778c1f9c373620e3f07787543914c6 (patch)
tree21128eb8abbfbc88122726b8ec7cfff34c469a1b /t/t4000-diff-format.sh
parentreset: suppress '--no-refresh' advice if logging is silenced (diff)
downloadtgif-4b8b0f6fa2778c1f9c373620e3f07787543914c6.tar.xz
stash: make internal resets quiet and refresh index
Add the options '-q' and '--refresh' to the 'git reset' executed in 'reset_head()', and '--refresh' to the 'git reset -q' executed in 'do_push_stash(...)'. 'stash' is implemented such that git commands invoked as part of it (e.g., 'clean', 'read-tree', 'reset', etc.) have their informational output silenced. However, the 'reset' in 'reset_head()' is *not* called with '-q', leading to the potential for a misleading printout from 'git stash apply --index' if the stash included a removed file: Unstaged changes after reset: D <deleted file> Not only is this confusing in its own right (since, after the reset, 'git stash' execution would stage the deletion in the index), it would be printed even when the stash was applied with the '-q' option. As a result, the messaging is removed entirely by calling 'git status' with '-q'. Additionally, because the default behavior of 'git reset -q' is to skip refreshing the index, but later operations in 'git stash' subcommands expect a non-stale index, enable '--refresh' as well. Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Victoria Dye <vdye@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4000-diff-format.sh')
0 files changed, 0 insertions, 0 deletions