From: Junio C Hamano <gitster@pobox.com>
To: Thomas Gummerer <t.gummerer@gmail.com>
Cc: git@vger.kernel.org, Marc Strapetz <marc.strapetz@syntevo.com>
Subject: Re: [PATCH v3 1/2] stash push: avoid printing errors
Date: Fri, 16 Mar 2018 14:31:11 -0700 [thread overview]
Message-ID: <xmqqtvtfzp0g.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20180316204306.862-2-t.gummerer@gmail.com> (Thomas Gummerer's message of "Fri, 16 Mar 2018 20:43:05 +0000")
Thomas Gummerer <t.gummerer@gmail.com> writes:
> @@ -322,9 +322,12 @@ push_stash () {
>
> if test $# != 0
> then
> - git add -u -- "$@" |
> - git checkout-index -z --force --stdin
This obviously is not something this patch breaks, but I am finding
this pipeline that was already here quite puzzling.
The "add -u" is about adding the changes in paths that match the
pathspec to the index; the output from it is meant for human
consumption and certainly is not something "--stdin" should expect
to be understandable, let alone with "-z".
... goes and digs ...
I think you mis-copied the suggestion in
https://public-inbox.org/git/xmqqpo7byjwb.fsf@gitster.mtv.corp.google.com/
when you made bba067d2 ("stash: don't delete untracked files that
match pathspec", 2018-01-06), and nobody caught that breakage during
the review.
> - git diff-index -p --cached --binary HEAD -- "$@" | git apply --index -R
> + if git ls-files --error-unmatch -- "$@" >/dev/null 2>/dev/null
> + then
> + git add -u -- "$@" |
> + git checkout-index -z --force --stdin
And the same breakage is inherited here; just drop "|" and
downstream "checkout-index" and you should be OK.
> + git diff-index -p --cached --binary HEAD -- "$@" | git apply --index -R
And while at it, let's split this to two lines after "|".
> + fi
next prev parent reply other threads:[~2018-03-16 21:31 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-03 9:44 git stash push -u always warns "pathspec '...' did not match any files" Marc Strapetz
2018-03-03 15:46 ` Thomas Gummerer
2018-03-04 10:44 ` Marc Strapetz
2018-03-09 22:18 ` Junio C Hamano
2018-03-10 9:18 ` Marc Strapetz
2018-03-10 11:12 ` Thomas Gummerer
2018-03-14 21:46 ` [PATCH v2 1/2] stash push: avoid printing errors Thomas Gummerer
2018-03-14 21:46 ` [PATCH v2 2/2] stash push -u: don't create empty stash Thomas Gummerer
2018-03-15 20:09 ` Junio C Hamano
2018-03-16 20:10 ` Thomas Gummerer
2018-03-15 8:51 ` [PATCH v2 1/2] stash push: avoid printing errors Marc Strapetz
2018-03-16 20:12 ` Thomas Gummerer
2018-03-16 20:43 ` [PATCH v3 0/2] stash push -u -- <pathspec> fixes Thomas Gummerer
2018-03-16 20:43 ` [PATCH v3 1/2] stash push: avoid printing errors Thomas Gummerer
2018-03-16 21:31 ` Junio C Hamano [this message]
2018-03-16 20:43 ` [PATCH v3 2/2] stash push -u: don't create empty stash Thomas Gummerer
2018-03-16 22:37 ` [PATCH v4 0/3] stash push -u -- <pathspec> fixes Junio C Hamano
2018-03-16 22:37 ` [PATCH v4 1/3] stash: fix nonsense pipeline Junio C Hamano
2018-03-16 22:37 ` [PATCH v4 2/3] stash push: avoid printing errors Junio C Hamano
2018-03-16 22:37 ` [PATCH v4 3/3] stash push -u: don't create empty stash Junio C Hamano
2018-03-17 11:36 ` [PATCH v4 0/3] stash push -u -- <pathspec> fixes Thomas Gummerer
2018-03-19 23:21 ` [PATCH v5 " Thomas Gummerer
2018-03-19 23:21 ` [PATCH v5 1/3] stash: fix nonsense pipeline Thomas Gummerer
2018-03-19 23:21 ` [PATCH v5 2/3] stash push: avoid printing errors Thomas Gummerer
2018-03-20 16:54 ` Junio C Hamano
2018-03-21 21:36 ` Thomas Gummerer
2018-03-21 21:53 ` [PATCH] stash: drop superfluos pathspec parameter (was: Re: [PATCH v5 2/3] stash push: avoid printing errors) Thomas Gummerer
2018-03-21 22:07 ` [PATCH] stash: drop superfluos pathspec parameter Junio C Hamano
2018-03-21 21:56 ` [PATCH v5 2/3] stash push: avoid printing errors Junio C Hamano
2018-03-19 23:21 ` [PATCH v5 3/3] stash push -u: don't create empty stash Thomas Gummerer
2018-03-20 10:06 ` [PATCH v5 0/3] stash push -u -- <pathspec> fixes Marc Strapetz
2018-03-19 15:44 ` [PATCH v3 0/2] " Marc Strapetz
2018-03-19 21:51 ` Thomas Gummerer
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=xmqqtvtfzp0g.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=marc.strapetz@syntevo.com \
--cc=t.gummerer@gmail.com \
/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).