From: Denton Liu <liu.denton@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Eric Sunshine <sunshine@sunshineco.com>
Subject: Re: [PATCH v4 0/2] stash show: learn --include-untracked and --only-untracked
Date: Wed, 3 Mar 2021 17:42:31 -0800 [thread overview]
Message-ID: <YEA7B2TKb6hgizZ4@generichostname> (raw)
In-Reply-To: <YEA43VRbgdA36MV1@generichostname>
On Wed, Mar 03, 2021 at 05:33:17PM -0800, Denton Liu wrote:
> Hi Junio,
>
> On Wed, Mar 03, 2021 at 04:38:31PM -0800, Junio C Hamano wrote:
> > Denton Liu <liu.denton@gmail.com> 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 decided to squash it into the current series because we have a lot of
time until it will be merged (since it's definitely not going in now
during the rc-period). If you'd like, though, I can reroll this series
with the callback as a commit on top.
> > 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@gmail.com>
> Subject: [PATCH] fixup! stash show: teach --include-untracked and --only-untracked
>
> Signed-off-by: Denton Liu <liu.denton@gmail.com>
> ---
> 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
>
prev parent reply other threads:[~2021-03-04 1:44 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-02 9:31 [PATCH 0/9] stash show: learn --include-untracked and --only-untracked Denton Liu
2021-02-02 9:33 ` [PATCH 1/9] git-stash.txt: be explicit about subcommand options Denton Liu
2021-02-02 17:37 ` Eric Sunshine
2021-02-02 9:33 ` [PATCH 2/9] t3905: remove spaces after redirect operators Denton Liu
2021-02-02 9:33 ` [PATCH 3/9] t3905: move all commands into test cases Denton Liu
2021-02-02 21:41 ` Junio C Hamano
2021-02-02 9:33 ` [PATCH 4/9] t3905: remove nested git in command substitution Denton Liu
2021-02-02 9:33 ` [PATCH 5/9] t3905: replace test -s with test_file_not_empty Denton Liu
2021-02-02 9:33 ` [PATCH 6/9] t3905: use test_cmp() to check file contents Denton Liu
2021-02-02 9:33 ` [PATCH 7/9] stash: declare ref_stash as an array Denton Liu
2021-02-02 21:46 ` Junio C Hamano
2021-02-02 9:33 ` [PATCH 8/9] stash show: teach --include-tracked and --only-untracked Denton Liu
2021-02-02 21:56 ` Junio C Hamano
2021-02-02 9:33 ` [PATCH 9/9] stash show: learn stash.showIncludeUntracked Denton Liu
2021-02-09 7:28 ` [PATCH v2 0/9] stash show: learn --include-untracked and --only-untracked Denton Liu
2021-02-09 7:28 ` [PATCH v2 1/9] git-stash.txt: be explicit about subcommand options Denton Liu
2021-02-10 7:17 ` Junio C Hamano
2021-02-11 19:07 ` [PATCH] fixup! " Denton Liu
2021-02-09 7:28 ` [PATCH v2 2/9] t3905: remove spaces after redirect operators Denton Liu
2021-02-10 7:18 ` Junio C Hamano
2021-02-09 7:28 ` [PATCH v2 3/9] t3905: move all commands into test cases Denton Liu
2021-02-09 7:28 ` [PATCH v2 4/9] t3905: remove nested git in command substitution Denton Liu
2021-02-10 7:24 ` Junio C Hamano
2021-02-09 7:28 ` [PATCH v2 5/9] t3905: replace test -s with test_file_not_empty Denton Liu
2021-02-09 7:28 ` [PATCH v2 6/9] t3905: use test_cmp() to check file contents Denton Liu
2021-02-09 7:28 ` [PATCH v2 7/9] stash: declare ref_stash as an array Denton Liu
2021-02-10 7:28 ` Junio C Hamano
2021-02-09 7:28 ` [PATCH v2 8/9] stash show: teach --include-untracked and --only-untracked Denton Liu
2021-02-10 7:53 ` Junio C Hamano
2021-02-16 3:15 ` Denton Liu
2021-02-16 6:42 ` Junio C Hamano
2021-02-09 7:28 ` [PATCH v2 9/9] stash show: learn stash.showIncludeUntracked Denton Liu
2021-02-16 7:11 ` [PATCH v3 0/2] stash show: learn --include-untracked and --only-untracked Denton Liu
2021-02-16 7:11 ` [PATCH v3 1/2] stash show: teach " Denton Liu
2021-02-16 20:22 ` Junio C Hamano
2021-02-17 11:18 ` Denton Liu
2021-02-17 17:50 ` Junio C Hamano
2021-02-17 2:31 ` Junio C Hamano
2021-02-16 7:11 ` [PATCH v3 2/2] stash show: learn stash.showIncludeUntracked Denton Liu
2021-03-03 11:16 ` [PATCH v4 0/2] stash show: learn --include-untracked and --only-untracked Denton Liu
2021-03-03 11:16 ` [PATCH v4 1/2] stash show: teach " Denton Liu
2021-03-03 11:16 ` [PATCH v4 2/2] stash show: learn stash.showIncludeUntracked Denton Liu
2021-03-04 0:38 ` [PATCH v4 0/2] stash show: learn --include-untracked and --only-untracked Junio C Hamano
2021-03-04 1:33 ` Denton Liu
2021-03-04 1:42 ` Denton Liu [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=YEA7B2TKb6hgizZ4@generichostname \
--to=liu.denton@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sunshine@sunshineco.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).