From: Thomas Gummerer <t.gummerer@gmail.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v2 1/3] stash: don't show internal implementation details
Date: Wed, 22 Mar 2017 21:33:47 +0000 [thread overview]
Message-ID: <20170322213347.GF27158@hank> (raw)
In-Reply-To: <20170321221445.3jpaoce7qbshtdoq@sigill.intra.peff.net>
On 03/21, Jeff King wrote:
> On Tue, Mar 21, 2017 at 10:12:17PM +0000, Thomas Gummerer wrote:
>
> > 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: Jeff King <peff@peff.net>
> > Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
>
> I think combining these is fine. The incorrect output with pathspecs
> isn't mentioned anymore, but I think that's OK.
Yeah, they felt so similar now that splitting this up in different
patches would be a bit too noisy.
> [...]
>
> > diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
> > index 89877e4b52..ea8e5c7818 100755
> > --- a/t/t3903-stash.sh
> > +++ b/t/t3903-stash.sh
> > @@ -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 1,1d >actual && # drop "Saved..."
> > test_i18ncmp expect actual
> > '
>
> This too, though I think "1d" would be the more usual way to say it.
Right thanks, I'll keep that in mind for another time. (I guess just
changing this doesn't warrant a re-roll?)
> -peff
next prev parent reply other threads:[~2017-03-22 21:34 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-17 14:50 [BUG] "git stash -- path" reports wrong unstaged changes Jeff King
2017-03-18 18:36 ` Thomas Gummerer
2017-03-19 20:23 ` Thomas Gummerer
2017-03-19 20:23 ` [PATCH/RFC 1/3] stash: show less information for stash push -- <pathspec> Thomas Gummerer
2017-03-20 17:51 ` Junio C Hamano
2017-03-20 18:48 ` Jeff King
2017-03-20 19:42 ` Junio C Hamano
2017-03-21 20:48 ` Thomas Gummerer
2017-03-20 18:42 ` Jeff King
2017-03-19 20:23 ` [PATCH/RFC 2/3] stash: make push -p -q --no-keep-index quiet Thomas Gummerer
2017-03-20 18:55 ` Jeff King
2017-03-19 20:23 ` [PATCH/RFC 3/3] stash: pass the pathspec argument to git reset Thomas Gummerer
2017-03-20 19:08 ` Jeff King
2017-03-21 21:14 ` Thomas Gummerer
2017-03-21 22:12 ` Jeff King
2017-03-21 22:12 ` [PATCH v2 0/3] Re: [BUG] "git stash -- path" reports wrong unstaged changes Thomas Gummerer
2017-03-21 22:12 ` [PATCH v2 1/3] stash: don't show internal implementation details Thomas Gummerer
2017-03-21 22:14 ` Jeff King
2017-03-22 21:33 ` Thomas Gummerer [this message]
2017-03-22 21:41 ` Jeff King
2017-03-21 22:12 ` [PATCH v2 2/3] stash: pass the pathspec argument to git reset Thomas Gummerer
2017-03-21 22:19 ` Jeff King
2017-03-21 22:12 ` [PATCH v2 3/3] stash: keep untracked files intact in stash -k Thomas Gummerer
2017-03-21 22:38 ` Jeff King
2017-03-22 21:46 ` Thomas Gummerer
2017-03-20 18:41 ` [BUG] "git stash -- path" reports wrong unstaged changes Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170322213347.GF27158@hank \
--to=t.gummerer@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).