[PATCH v2] stash: prevent warning about null bytes in input
- From
Kevin Daudt <me@ikke.info>
- Date
- Aug 14, 2017, 21:43 UTC
- Message-ID
- <20170814214333.12789-1-me@ikke.info>
- In-Reply-To
- <20170814050801.7158-1-me@ikke.info>
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, make sure `untracked_files` does not output null bytes when not required.
This is achieved by adding a parameter to the `untracked_files` function to specify wither `-z` should be passed to ls-files or not.
This warning is triggered when running git stash save -u resulting in two warnings:
git-stash: line 43: warning: command substitution: ignored null byte
in inputSigned-off-by: Kevin Daudt <me@ikke.info> --- git-stash.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/git-stash.sh b/git-stash.sh index 9b6c2da7b..5f09a47f0 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" &&
-- 2.14.1.145.gb3622a4ee9