There is a change in behaviour with this commit. When there was
no initial commit, the shell version of stash would still display
a message. This commit makes `push` to not display any message if
`--quiet` or `-q` is specified.
Signed-off-by: Paul-Sebastian Ungureanu <ungureanupaulsebast...@gmail.com>
---
builtin/stash--helper.c | 47 ++++++++++++++++++++++++++---------------
t/t3903-stash.sh | 23 ++++++++++++++++++++
2 files changed, 53 insertions(+), 17 deletions(-)
diff --git a/builtin/stash--helper.c b/builtin/stash--helper.c
index 23670321d8..e5153a63ea 100644
--- a/builtin/stash--helper.c
+++ b/builtin/stash--helper.c
@@ -938,7 +938,7 @@ static int save_untracked_files(struct stash_info *info,
struct strbuf *msg,
static struct strbuf patch = STRBUF_INIT;
-static int stash_patch(struct stash_info *info, struct pathspec ps)
+static int stash_patch(struct stash_info *info, struct pathspec ps, int quiet)
{
int i;
int ret = 0;
@@ -991,7 +991,8 @@ static int stash_patch(struct stash_info *info, struct
pathspec ps)
}
if (!patch.len) {
- fprintf_ln(stderr, _("No changes selected"));
+ if (!quiet)
+ fprintf_ln(stderr, _("No changes selected"));
ret = 1;
}
@@ -1069,7 +1070,7 @@ static int stash_working_tree(struct stash_info *info,
struct pathspec ps)
static int do_create_stash(struct pathspec ps, const char **stash_msg,
int include_untracked, int patch_mode,
- struct stash_info *info)
+ struct stash_info *info, int quiet)
{
int untracked_commit_option = 0;
int ret = 0;
@@ -1094,7 +1095,8 @@ static int do_create_stash(struct pathspec ps, const char
**stash_msg,
}
if (get_oid("HEAD", &info->b_commit)) {
- fprintf_ln(stderr, _("You do not have the initial commit yet"));
+ if (!quiet)
+ fprintf_ln(stderr, _("You do not have the initial
commit yet"));
ret = -1;
*stash_msg = NULL;
goto done;
@@ -1115,7 +1117,8 @@ static int do_create_stash(struct pathspec ps, const char
**stash_msg,
if (write_cache_as_tree(&info->i_tree, 0, NULL) ||
commit_tree(commit_tree_label.buf, commit_tree_label.len,
&info->i_tree, parents, &info->i_commit, NULL, NULL)) {
- fprintf_ln(stderr, _("Cannot save the current index state"));
+ if (!quiet)
+ fprintf_ln(stderr, _("Cannot save the current index
state"));
ret = -1;
*stash_msg = NULL;
goto done;
@@ -1124,7 +1127,8 @@ static int do_create_stash(struct pathspec ps, const char
**stash_msg,
if (include_untracked && get_untracked_files(ps, include_untracked,
&out)) {
if (save_untracked_files(info, &msg, &out)) {
- fprintf_ln(stderr, _("Cannot save the untracked
files"));
+ if (!quiet)
+ fprintf_ln(stderr, _("Cannot save the untracked
files"));
ret = -1;
*stash_msg = NULL;
goto done;
@@ -1132,17 +1136,19 @@ static int do_create_stash(struct pathspec ps, const
char **stash_msg,
untracked_commit_option = 1;
}
if (patch_mode) {
- ret = stash_patch(info, ps);
+ ret = stash_patch(info, ps, quiet);
*stash_msg = NULL;
if (ret < 0) {
- fprintf_ln(stderr, _("Cannot save the current worktree
state"));
+ if (!quiet)
+ fprintf_ln(stderr, _("Cannot save the current
worktree state"));
goto done;
} else if (ret > 0) {
goto done;
}
} else {
if (stash_working_tree(info, ps)) {
- fprintf_ln(stderr, _("Cannot save the current worktree
state"));
+ if (!quiet)
+ fprintf_ln(stderr, _("Cannot save the current
worktree state"));
ret = -1;
*stash_msg = NULL;
goto done;
@@ -1168,7 +1174,8 @@ static int do_create_stash(struct pathspec ps, const char
**stash_msg,
if (commit_tree(*stash_msg, strlen(*stash_msg), &info->w_tree,
parents, &info->w_commit, NULL, NULL)) {
- fprintf_ln(stderr, _("Cannot record working tree state"));
+ if (!quiet)
+ fprintf_ln(stderr, _("Cannot record working tree
state"));
ret = -1;
goto done;
}
@@ -1201,7 +1208,7 @@ static int create_stash(int argc, const char **argv,
const char *prefix)
0);
memset(&ps, 0, sizeof(ps));
- ret = do_create_stash(ps, &stash_msg, include_untracked, 0, &info);
+ ret = do_create_stash(ps, &stash_msg, include_untracked, 0, &info, 0);
if (!ret)
printf_ln("%s", oid_to_hex(&info.w_commit));
@@ -1255,28 +1262,33 @@ static int do_push_stash(struct pathspec ps, const char
*stash_msg, int quiet,
return -1;
if (!check_changes(ps, include_untracked)) {
- printf_ln(_("No local changes to save"));
+ if (!quiet)
+ printf_ln(_("No local changes to save"));
return 0;
}
if (!reflog_exists(ref_stash) && do_clear_stash()) {
- fprintf_ln(stderr, _("Cannot initialize stash"));
+ if (!quiet)
+ fprintf_ln(stderr, _("Cannot initialize stash"));
return -1;
}
if (do_create_stash(ps, &stash_msg, include_untracked, patch_mode,
- &info)) {
+ &info, quiet)) {
ret = -1;
goto done;
}
if (do_store_stash(oid_to_hex(&info.w_commit), stash_msg, 1)) {
- fprintf(stderr, _("Cannot save the current status"));
+ if (!quiet)
+ fprintf_ln(stderr, _("Cannot save the current status"));
ret = -1;
goto done;
}
- printf_ln(_("Saved working directory and index state %s"), stash_msg);
+ if (!quiet)
+ printf_ln(_("Saved working directory and index state %s"),
+ stash_msg);
if (!patch_mode) {
if (include_untracked && !ps.nr) {
@@ -1375,7 +1387,8 @@ static int do_push_stash(struct pathspec ps, const char
*stash_msg, int quiet,
argv_array_pushl(&cp.args, "apply", "-R", NULL);
if (pipe_command(&cp, patch.buf, patch.len, NULL, 0, NULL, 0)) {
- fprintf_ln(stderr, _("Cannot remove worktree changes"));
+ if (!quiet)
+ fprintf_ln(stderr, _("Cannot remove worktree
changes"));
ret = -1;
goto done;
}
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index 3114c7bc4c..ed4611d3d8 100755
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -1064,6 +1064,29 @@ test_expect_success 'push: <pathspec> not in the
repository errors out' '
test_path_is_file untracked
'
+test_expect_success 'push: -q is quiet with changes' '
+ >foo &&
+ git add foo &&
+ git stash push -q >output 2>&1 &&
+ test_must_be_empty output
+'
+
+test_expect_success 'push: -q is quiet with no changes' '
+ git stash push -q >output 2>&1 &&
+ test_must_be_empty output
+'
+
+test_expect_success 'push: -q is quiet even if there is no initial commit' '
+ git init foo_dir &&
+ test_when_finished rm -rf foo_dir &&
+ (
+ cd foo_dir &&
+ >bar &&
+ test_must_fail git stash push -q >output 2>&1 &&
+ test_must_be_empty output
+ )
+'
+
test_expect_success 'untracked files are left in place when -u is not given' '
>file &&
git add file &&
--
2.19.0.rc0.22.gc26283d74e
