From: Thomas Gummerer <t.gummerer@gmail.com>
To: Marc Strapetz <marc.strapetz@syntevo.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v3 0/2] stash push -u -- <pathspec> fixes
Date: Mon, 19 Mar 2018 21:51:50 +0000 [thread overview]
Message-ID: <20180319215150.GF2224@hank> (raw)
In-Reply-To: <bc69c1f4-7098-1bbf-e69b-97808c4d8779@syntevo.com>
On 03/19, Marc Strapetz wrote:
> On 16.03.2018 21:43, Thomas Gummerer wrote:
> >Thanks Marc for catching the regression I almost introduced and Junio
> >for the review of the second patch. Here's a re-roll that should fix
> >the issues of v2.
>
> Thanks, existing issues are fixed, but cleanup of the stashed files seems to
> not work properly when stashing a mixture of tracked and untracked files:
Thanks for the continued testing, and sorry I just can't seem to get
this right :/ The problem here was that I misunderstood what 'git
ls-files --error-unmatch' does without testing it myself. I'll send
v5 in a bit, which will hopefully finally fix all the cases.
> $ git init
> $ touch file1
> $ touch file2
> $ git add file1 file2
> $ git commit -m "initial import"
> $ echo "a" > file1
> $ echo "b" > file2
> $ touch file3
> $ git status --porcelain
> M file1
> M file2
> ?? file3
> $ git stash push -u -- file1 file3
> Saved working directory and index state WIP on master: 48fb140 initial
> import
> $ git status --porcelain
> M file1
> M file2
>
> file1 and file3 are properly stashed, but file1 still remains modified in
> the working tree. When instead stashing file1 and file2, results are fine:
>
> $ git stash push -u -- file1 file2
> Saved working directory and index state WIP on master: 48fb140 initial
> import
> $ git status
> On branch master
> nothing to commit, working tree clean
>
> -Marc
>
>
prev parent reply other threads:[~2018-03-19 21:48 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-03 9:44 git stash push -u always warns "pathspec '...' did not match any files" Marc Strapetz
2018-03-03 15:46 ` Thomas Gummerer
2018-03-04 10:44 ` Marc Strapetz
2018-03-09 22:18 ` Junio C Hamano
2018-03-10 9:18 ` Marc Strapetz
2018-03-10 11:12 ` Thomas Gummerer
2018-03-14 21:46 ` [PATCH v2 1/2] stash push: avoid printing errors Thomas Gummerer
2018-03-14 21:46 ` [PATCH v2 2/2] stash push -u: don't create empty stash Thomas Gummerer
2018-03-15 20:09 ` Junio C Hamano
2018-03-16 20:10 ` Thomas Gummerer
2018-03-15 8:51 ` [PATCH v2 1/2] stash push: avoid printing errors Marc Strapetz
2018-03-16 20:12 ` Thomas Gummerer
2018-03-16 20:43 ` [PATCH v3 0/2] stash push -u -- <pathspec> fixes Thomas Gummerer
2018-03-16 20:43 ` [PATCH v3 1/2] stash push: avoid printing errors Thomas Gummerer
2018-03-16 21:31 ` Junio C Hamano
2018-03-16 20:43 ` [PATCH v3 2/2] stash push -u: don't create empty stash Thomas Gummerer
2018-03-16 22:37 ` [PATCH v4 0/3] stash push -u -- <pathspec> fixes Junio C Hamano
2018-03-16 22:37 ` [PATCH v4 1/3] stash: fix nonsense pipeline Junio C Hamano
2018-03-16 22:37 ` [PATCH v4 2/3] stash push: avoid printing errors Junio C Hamano
2018-03-16 22:37 ` [PATCH v4 3/3] stash push -u: don't create empty stash Junio C Hamano
2018-03-17 11:36 ` [PATCH v4 0/3] stash push -u -- <pathspec> fixes Thomas Gummerer
2018-03-19 23:21 ` [PATCH v5 " Thomas Gummerer
2018-03-19 23:21 ` [PATCH v5 1/3] stash: fix nonsense pipeline Thomas Gummerer
2018-03-19 23:21 ` [PATCH v5 2/3] stash push: avoid printing errors Thomas Gummerer
2018-03-20 16:54 ` Junio C Hamano
2018-03-21 21:36 ` Thomas Gummerer
2018-03-21 21:53 ` [PATCH] stash: drop superfluos pathspec parameter (was: Re: [PATCH v5 2/3] stash push: avoid printing errors) Thomas Gummerer
2018-03-21 22:07 ` [PATCH] stash: drop superfluos pathspec parameter Junio C Hamano
2018-03-21 21:56 ` [PATCH v5 2/3] stash push: avoid printing errors Junio C Hamano
2018-03-19 23:21 ` [PATCH v5 3/3] stash push -u: don't create empty stash Thomas Gummerer
2018-03-20 10:06 ` [PATCH v5 0/3] stash push -u -- <pathspec> fixes Marc Strapetz
2018-03-19 15:44 ` [PATCH v3 0/2] " Marc Strapetz
2018-03-19 21:51 ` 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
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=20180319215150.GF2224@hank \
--to=t.gummerer@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=marc.strapetz@syntevo.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).