From: Marc Strapetz Date: Mon, 19 Mar 2018 15:44:17 GMT Subject: Re: [PATCH v3 0/2] stash push -u -- fixes Message-ID: In-Reply-To: <20180316204306.862-1-t.gummerer@gmail.com> 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: $ 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