stash: make push -q quiet

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. Add tests for `--quiet`.

Signed-off-by: Paul-Sebastian Ungureanu <ungureanupaulsebastian@gmail.com>
Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/stash--helper.c b/builtin/stash--helper.c
index 30c7aad76a57a7b8f245f9ee49b6c788a46b192b..1c6135209367564ca0a6f9833f33e1d2ea952340 100644 (file)
--- a/builtin/stash--helper.c
+++ b/builtin/stash--helper.c
@@ -966,7 +966,7 @@ static int save_untracked_files(struct stash_info *info, struct strbuf *msg,
 }
 
 static int stash_patch(struct stash_info *info, struct pathspec ps,
-                      struct strbuf *out_patch)
+                      struct strbuf *out_patch, int quiet)
 {
        int ret = 0;
        struct strbuf out = STRBUF_INIT;
@@ -1019,7 +1019,8 @@ static int stash_patch(struct stash_info *info, struct pathspec ps,
        }
 
        if (!out_patch->len) {
-               fprintf_ln(stderr, _("No changes selected"));
+               if (!quiet)
+                       fprintf_ln(stderr, _("No changes selected"));
                ret = 1;
        }
 
@@ -1098,7 +1099,8 @@ static int stash_working_tree(struct stash_info *info, struct pathspec ps)
 
 static int do_create_stash(struct pathspec ps, struct strbuf *stash_msg_buf,
                           int include_untracked, int patch_mode,
-                          struct stash_info *info, struct strbuf *patch)
+                          struct stash_info *info, struct strbuf *patch,
+                          int quiet)
 {
        int ret = 0;
        int flags = 0;
@@ -1118,7 +1120,9 @@ static int do_create_stash(struct pathspec ps, struct strbuf *stash_msg_buf,
        refresh_cache(REFRESH_QUIET);
 
        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;
                goto done;
        } else {
@@ -1143,7 +1147,9 @@ static int do_create_stash(struct pathspec ps, struct strbuf *stash_msg_buf,
        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;
                goto done;
        }
@@ -1151,26 +1157,29 @@ static int do_create_stash(struct pathspec ps, struct strbuf *stash_msg_buf,
        if (include_untracked && get_untracked_files(ps, include_untracked,
                                                     &untracked_files)) {
                if (save_untracked_files(info, &msg, untracked_files)) {
-                       fprintf_ln(stderr, _("Cannot save "
-                                            "the untracked files"));
+                       if (!quiet)
+                               fprintf_ln(stderr, _("Cannot save "
+                                                    "the untracked files"));
                        ret = -1;
                        goto done;
                }
                untracked_commit_option = 1;
        }
        if (patch_mode) {
-               ret = stash_patch(info, ps, patch);
+               ret = stash_patch(info, ps, patch, quiet);
                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;
                        goto done;
                }
@@ -1196,7 +1205,9 @@ static int do_create_stash(struct pathspec ps, struct strbuf *stash_msg_buf,
 
        if (commit_tree(stash_msg_buf->buf, stash_msg_buf->len, &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;
        }
@@ -1231,7 +1242,7 @@ static int create_stash(int argc, const char **argv, const char *prefix)
        memset(&ps, 0, sizeof(ps));
        strbuf_addstr(&stash_msg_buf, stash_msg);
        ret = do_create_stash(ps, &stash_msg_buf, include_untracked, 0, &info,
-                             NULL);
+                             NULL, 0);
        if (!ret)
                printf_ln("%s", oid_to_hex(&info.w_commit));
 
@@ -1293,26 +1304,29 @@ static int do_push_stash(struct pathspec ps, const char *stash_msg, int quiet,
 
        if (!reflog_exists(ref_stash) && do_clear_stash()) {
                ret = -1;
-               fprintf_ln(stderr, _("Cannot initialize stash"));
+               if (!quiet)
+                       fprintf_ln(stderr, _("Cannot initialize stash"));
                goto done;
        }
 
        if (stash_msg)
                strbuf_addstr(&stash_msg_buf, stash_msg);
        if (do_create_stash(ps, &stash_msg_buf, include_untracked, patch_mode,
-                           &info, &patch)) {
+                           &info, &patch, quiet)) {
                ret = -1;
                goto done;
        }
 
        if (do_store_stash(&info.w_commit, stash_msg_buf.buf, 1)) {
                ret = -1;
-               fprintf_ln(stderr, _("Cannot save the current status"));
+               if (!quiet)
+                       fprintf_ln(stderr, _("Cannot save the current status"));
                goto done;
        }
 
-       printf_ln(_("Saved working directory and index state %s"),
-                 stash_msg_buf.buf);
+       if (!quiet)
+               printf_ln(_("Saved working directory and index state %s"),
+                         stash_msg_buf.buf);
 
        if (!patch_mode) {
                if (include_untracked && !ps.nr) {
@@ -1414,7 +1428,9 @@ 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 b66da42831d38a1b6462318ee33bf48ffaaab6ee..97cc71fbaf6561995b75431c9e7b6173ba66902f 100755 (executable)
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -1072,6 +1072,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 &&