On 03/03, Marc Strapetz wrote:
> Reproducible in a test repository with following steps:
>
> $ touch untracked
> $ git stash push -u -- untracked
> Saved working directory and index state WIP on master: 0096475 init
> fatal: pathspec 'untracked' did not match any files
> error: unrecognized input
>
> The file is stashed correctly, though.
>
> Tested with Git 2.16.2 on Linux and Windows.
Thanks for the bug report and the reproduction recipe. The following
patch should fix it:
--- >8 ---
Subject: [PATCH] stash push: avoid printing errors
Currently 'git stash push -u -- <pathspec>' prints the following errors
if <pathspec> only matches untracked files:
fatal: pathspec 'untracked' did not match any files
error: unrecognized input
This is because we first clean up the untracked files using 'git clean
<pathspec>', and then use a command chain involving 'git add -u
<pathspec>' and 'git apply' to clear the changes to files that are in
the index and were stashed.
As the <pathspec> only includes untracked files that were already
removed by 'git clean', the 'git add' call will barf, and so will 'git
apply', as there are no changes that need to be applied.
Fix this by making sure to only call this command chain if there are
still files that match <pathspec> after the call to 'git clean'.
Reported-by: Marc Strapetz <marc.strapetz@xxxxxxxxxxx>
Signed-off-by: Thomas Gummerer <t.gummerer@xxxxxxxxx>
---
git-stash.sh | 2 +-
t/t3903-stash.sh | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/git-stash.sh b/git-stash.sh
index fc8f8ae640..058ad0bed8 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -320,7 +320,7 @@ push_stash () {
git clean --force --quiet -d $CLEAN_X_OPTION -- "$@"
fi
- if test $# != 0
+ if test $# != 0 && git ls-files --error-unmatch -- "$@" >/dev/null 2>/dev/null
then
git add -u -- "$@" |
git checkout-index -z --force --stdin
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index aefde7b172..506004aece 100755
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -1096,4 +1096,11 @@ test_expect_success 'stash -- <subdir> works with binary files' '
test_path_is_file subdir/untracked
'
+test_expect_success 'stash -- <untracked> doesnt print error' '
+ >untracked &&
+ git stash push -u -- untracked 2>actual&&
+ test_path_is_missing untracked &&
+ test_line_count = 0 actual
+'
+
test_done
--
2.16.2.395.g2e18187dfd
