From: Victoria Dye <vdye@xxxxxxxxxx>
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.
Signed-off-by: Victoria Dye <vdye@xxxxxxxxxx>
---
builtin/stash.c | 5 ++--
t/t3903-stash.sh | 12 ++++++++++
t/t7102-reset.sh | 60 +++++++++++++++++++++++++++++++-----------------
3 files changed, 54 insertions(+), 23 deletions(-)
diff --git a/builtin/stash.c b/builtin/stash.c
index 3e8af210fde..91407d9bbe0 100644
--- a/builtin/stash.c
+++ b/builtin/stash.c
@@ -310,7 +310,7 @@ static int reset_head(void)
* API for resetting.
*/
cp.git_cmd = 1;
- strvec_push(&cp.args, "reset");
+ strvec_pushl(&cp.args, "reset", "--quiet", "--refresh", NULL);
return run_command(&cp);
}
@@ -1633,7 +1633,8 @@ static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int q
struct child_process cp = CHILD_PROCESS_INIT;
cp.git_cmd = 1;
- strvec_pushl(&cp.args, "reset", "-q", "--", NULL);
+ strvec_pushl(&cp.args, "reset", "-q", "--refresh", "--",
+ NULL);
add_pathspecs(&cp.args, ps);
if (run_command(&cp)) {
ret = -1;
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index f36e121210e..17f2ad2344c 100755
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -261,6 +261,18 @@ test_expect_success 'apply -q is quiet' '
test_must_be_empty output.out
'
+test_expect_success 'apply --index -q is quiet' '
+ # Added file, deleted file, modified file all staged for commit
+ echo foo >new-file &&
+ echo test >file &&
+ git add new-file file &&
+ git rm other-file &&
+
+ git stash &&
+ git stash apply --index -q >output.out 2>&1 &&
+ test_must_be_empty output.out
+'
+
test_expect_success 'save -q is quiet' '
git stash save --quiet >output.out 2>&1 &&
test_must_be_empty output.out
diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh
index 5e68180f3b2..f2076545133 100755
--- a/t/t7102-reset.sh
+++ b/t/t7102-reset.sh
@@ -482,7 +482,7 @@ test_index_refreshed () {
git rm --cached file2 &&
# Step 2
- git reset $1 --mixed HEAD &&
+ git reset $@ --mixed HEAD &&
# Step 3
git read-tree -m HEAD~1
@@ -491,48 +491,66 @@ test_index_refreshed () {
test_expect_success '--mixed refreshes the index' '
# Verify default behavior (with no config settings or command line
# options)
- test_index_refreshed &&
+ test_index_refreshed
'
test_expect_success '--mixed --[no-]quiet sets default refresh behavior' '
# Verify that --[no-]quiet and `reset.quiet` (without --[no-]refresh)
# determine refresh behavior
- # Config setting
- test_must_fail test_index_refreshed -c reset.quiet=true &&
- test_index_refreshed -c reset.quiet=true &&
-
# Command line option
- test_must_fail test_index_refreshed --quiet &&
+ ! test_index_refreshed --quiet &&
test_index_refreshed --no-quiet &&
- # Command line option overrides config setting
- test_must_fail test_index_refreshed -c reset.quiet=false --quiet &&
- test_index_refreshed -c reset.refresh=true --no-quiet
+ # Config: reset.quiet=false
+ test_config reset.quiet false &&
+ (
+ test_index_refreshed &&
+ ! test_index_refreshed --quiet
+ ) &&
+
+ # Config: reset.quiet=true
+ test_config reset.quiet true &&
+ (
+ ! test_index_refreshed &&
+ test_index_refreshed --no-quiet
+ )
'
test_expect_success '--mixed --[no-]refresh sets refresh behavior' '
# Verify that --[no-]refresh and `reset.refresh` control index refresh
- # Config setting
- test_index_refreshed -c reset.refresh=true &&
- test_must_fail test_index_refreshed -c reset.refresh=false &&
-
# Command line option
test_index_refreshed --refresh &&
- test_must_fail test_index_refreshed --no-refresh &&
+ ! test_index_refreshed --no-refresh &&
+
+ # Config: reset.refresh=false
+ test_config reset.refresh false &&
+ (
+ ! test_index_refreshed &&
+ test_index_refreshed --refresh
+ ) &&
- # Command line option overrides config setting
- test_index_refreshed -c reset.refresh=false --refresh &&
- test_must_fail test_index_refreshed -c reset.refresh=true --no-refresh
+ # Config: reset.refresh=true
+ test_config reset.refresh true &&
+ (
+ test_index_refreshed &&
+ ! test_index_refreshed --no-refresh
+ )
'
test_expect_success '--mixed --refresh overrides --quiet refresh behavior' '
# Verify that *both* --refresh and `reset.refresh` override the
# default non-refresh behavior of --quiet
+
test_index_refreshed --refresh --quiet &&
- test_index_refreshed --refresh -c reset.quiet=true &&
- test_index_refreshed -c reset.refresh=true --quiet &&
- test_index_refreshed -c reset.refresh=true -c reset.quiet=true
+
+ # Config: reset.quiet=true
+ test_config reset.quiet true &&
+ test_index_refreshed --refresh &&
+
+ # Config: reset.quiet=true, reset.refresh=true
+ test_config reset.refresh true &&
+ test_index_refreshed
'
test_expect_success '--mixed preserves skip-worktree' '
--
gitgitgadget
