From: Thomas Gummerer <t.gummerer@gmail.com>
To: Hosam Aly Mahmoud <hosamaly6@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: git stash push -u deletes untracked files
Date: Mon, 2 Apr 2018 22:39:48 +0100 [thread overview]
Message-ID: <20180402213944.GF2629@hank> (raw)
In-Reply-To: <CAJA-u1okS1GO8+mHGbz23cs0CRt7wQAPHHsnvmZnZe4ZOf2VqQ@mail.gmail.com>
On 04/02, Hosam Aly Mahmoud wrote:
> Hi,
>
> Using Git 2.16.3 on MacOS 10.13.3, running `git stash push
> --include-untracked` deletes the untracked files specified in its
> arguments and creates an empty stash commit.
>
> In the example below, I create a repository with a single file and a
> single commit. Then I create two untracked files and push one of them
> to the stash. Although I get an error, an empty stash commit is
> generated and the specified file is deleted.
Thanks for your report. This has been reported first in
https://public-inbox.org/git/349f9369-b799-4f7b-bda1-33bcbd7ea067@syntevo.com/,
and fixed there. The fix wasn't merged to 'master' yet, but it is in
the 'next' branch.
Now that 2.17 was released, I'd expect this to be merged to 'master'
at some point. If you'd like to help the fix along, it would be
awesome if you could test the current 'next' branch, and report back
whether or not the fix works for you.
> ```
> $ git init . && touch README && git commit -m "README"
> $ touch my-file my-other-file
> $ git status
> On branch master
> Untracked files:
> my-file
> my-other-file
>
> nothing added to commit but untracked files present
> $ git stash push -u my-file
> Saved working directory and index state WIP on master: e89afc6 README
> fatal: pathspec 'my-file' did not match any files
> error: unrecognized input
> $ git status
> On branch master
> Untracked files:
> my-other-file
>
> nothing added to commit but untracked files present
> $ git stash list
> stash@{0}: WIP on master: e89afc6 README
> $ git stash show
> $
> $ ls
> README my-other-file
> ```
>
> I tested this using git built from the latest commit on master at the
> time of writing (c2a499e6c31ed613a606ffdeb5bb74ab41e9a586) and got the
> same results. Could you please check it out?
>
>
> Thank you,
>
> Hosam Aly
prev parent reply other threads:[~2018-04-02 20:36 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-02 16:07 git stash push -u deletes untracked files Hosam Aly Mahmoud
2018-04-02 21:39 ` Thomas Gummerer [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180402213944.GF2629@hank \
--to=t.gummerer@gmail.com \
--cc=git@vger.kernel.org \
--cc=hosamaly6@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.
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 NNTP newsgroup(s).