From: Kevin Daudt <me@ikke.info>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] stash: prevent warning about null bytes in input
Date: Mon, 14 Aug 2017 22:32:46 +0200 [thread overview]
Message-ID: <20170814203246.GA3839@alpha.vpn.ikke.info> (raw)
In-Reply-To: <xmqq7ey6udvl.fsf@gitster.mtv.corp.google.com>
On Mon, Aug 14, 2017 at 12:51:26PM -0700, Junio C Hamano wrote:
> Kevin Daudt <me@ikke.info> writes:
>
> > The no_changes function calls the untracked_files function through
> > command substitution. untracked_files will return null bytes because it
> > runs ls-files with the '-z' option.
> >
> > Bash since version 4.4 warns about these null bytes. As they are not
> > required for the test that is being done, remove null bytes from the
> > input.
>
> That's an interesting one ;-)
>
> I wonder if you considered giving an option to untracked_files
> helper function, though. After all, it has only two callers,
> and it feels a bit suboptimal to ask the command to do a special
> thing (i.e. "-z") only to clean it up with a pipe.
As a matter of fact, I did not consider that option. I do agree that's a
much better approach.
>
> IOW, something along the lines of (totally untested)...
>
How should I proceed with this? Resubmit it after testing with the
appropriate attribution?
> git-stash.sh | 11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/git-stash.sh b/git-stash.sh
> index 9b6c2da7b4..5f09a47f0a 100755
> --- a/git-stash.sh
> +++ b/git-stash.sh
> @@ -43,9 +43,16 @@ no_changes () {
> }
>
> untracked_files () {
> + if test "$1" = "-z"
> + then
> + shift
> + z=-z
> + else
> + z=
> + fi
> excl_opt=--exclude-standard
> test "$untracked" = "all" && excl_opt=
> - git ls-files -o -z $excl_opt -- "$@"
> + git ls-files -o $z $excl_opt -- "$@"
> }
>
> clear_stash () {
> @@ -114,7 +121,7 @@ create_stash () {
> # Untracked files are stored by themselves in a parentless commit, for
> # ease of unpacking later.
> u_commit=$(
> - untracked_files "$@" | (
> + untracked_files -z "$@" | (
> GIT_INDEX_FILE="$TMPindex" &&
> export GIT_INDEX_FILE &&
> rm -f "$TMPindex" &&
>
>
next prev parent reply other threads:[~2017-08-14 20:32 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-14 5:08 [PATCH] stash: prevent warning about null bytes in input Kevin Daudt
2017-08-14 19:51 ` Junio C Hamano
2017-08-14 20:32 ` Kevin Daudt [this message]
2017-08-14 20:37 ` Junio C Hamano
2017-08-14 21:43 ` [PATCH v2] " Kevin Daudt
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=20170814203246.GA3839@alpha.vpn.ikke.info \
--to=me@ikke.info \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).