Junio C Hamano <gitster@xxxxxxxxx> writes:
> Remi Galan Alfonso <remi.galan-alfonso@xxxxxxxxxxxxxxxxxxxxxxx>
> writes:
>
> > Daniele Segato <daniele.segato@xxxxxxxxx> wrote:
> > ...
> >> git version 1.9.1
> >
> > Contrary to what I expected, this seems to still be the case with:
> > $ git --version
> > git version 2.8.0.rc2
>
> I do not think "git stash" has been updated in any major way to
> address correctness (including its corner case behaviour) ever since
> it was originally written, so it is very likely that any bug you see
> would be with it since the very old days.
For this bug it doesn't seem to be specifically linked to git stash,
since 'git status' doesn't display correct informations in the first
place (it doesn't show foo/bar as an untracked file).
I tried something quickly, based on Daniele's case:
git init
echo 'X' >foo
git add foo
git commit -m "Added foo"
rm foo
mkdir foo
echo 'B' >foo/bar
git status # foo/bar not shown in Untracked files
git add foo/bar
git status then shows as expected:
# On branch master
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# deleted: foo
# new file: foo/bar
However git stash fails this time:
# error: foo: is a directory - add individual files instead
# fatal: Unable to process path foo
# Cannot save the current worktree state
I am not sure what should be the correct behaviour here.
This however might be one of the corner cases you mentionned.
Thanks,
Rémi
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html