Hi Junio, On Wed, Mar 03, 2021 at 04:38:31PM -0800, Junio C Hamano wrote: > Denton Liu <liu.denton@xxxxxxxxx> writes: > > > A blindspot that I've noticed in git is that it's not possible to > > properly view a stash entry that has untracked files via `git stash > > show`. Teach `git stash show --include-untracked` which should do this. > > In addition, this series also teaches `--only-untracked` and the > > `stash.showIncludeUntracked` config option. > > > > This series is based on 'dl/stash-cleanup'. > > > > Changes since v3: > > > > * Incorporate Junio's SQUASH??? commits > > > > * Implement a custom unpack_trees() callback to detect the case where > > there are duplicate entries in worktree and untracked commits > > I actually expected the latter enhancement to be done outside the > scope of this series. I briefly looked at the callback but I am not > convinced that it is correct (e.g. how do you notice and barf when > the untracked tree records foo/bar.txt and the index or the working > tree records foo as a file?). >From my testing, the conflict is detected just fine. The following test-case should confirm it: -- >8 -- From: Denton Liu <liu.denton@xxxxxxxxx> Subject: [PATCH] fixup! stash show: teach --include-untracked and --only-untracked Signed-off-by: Denton Liu <liu.denton@xxxxxxxxx> --- t/t3905-stash-include-untracked.sh | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/t/t3905-stash-include-untracked.sh b/t/t3905-stash-include-untracked.sh index b470db7ef7..470aa65b44 100755 --- a/t/t3905-stash-include-untracked.sh +++ b/t/t3905-stash-include-untracked.sh @@ -405,4 +405,27 @@ test_expect_success 'stash show --include-untracked errors on duplicate files' ' test_i18ngrep "worktree and untracked commit have duplicate entries: tracked" err ' +test_expect_success 'stash show --include-untracked errors on directory/file conflict' ' + git reset --hard && + git clean -xf && + >tracked && + git add tracked && + tree=$(git write-tree) && + i_commit=$(git commit-tree -p HEAD -m "index on any-branch" "$tree") && + test_when_finished "rm -f untracked_index" && + u_commit=$( + GIT_INDEX_FILE="untracked_index" && + export GIT_INDEX_FILE && + rm tracked && + mkdir tracked && + >tracked/file && + git update-index --add tracked/file && + u_tree=$(git write-tree) && + git commit-tree -m "untracked files on any-branch" "$u_tree" + ) && + w_commit=$(git commit-tree -p HEAD -p "$i_commit" -p "$u_commit" -m "WIP on any-branch" "$tree") && + test_must_fail git stash show --include-untracked "$w_commit" 2>err && + test_i18ngrep "worktree and untracked commit have duplicate entries: tracked" err +' + test_done -- 2.31.0.rc1.228.gb75b4e4ce2
