From: Max Kirillov <max@max630.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Max Kirillov" <max@max630.net>,
git@vger.kernel.org, "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: Re: [PATCH] unpack-trees: do not fail reset because of unmerged skipped entry
Date: Tue, 10 Jul 2018 22:23:10 +0300 [thread overview]
Message-ID: <20180710192309.GB2050@jessie.local> (raw)
In-Reply-To: <xmqqh8m3zurz.fsf@gitster-ct.c.googlers.com>
On Fri, Jun 15, 2018 at 12:58:40PM -0700, Junio C Hamano wrote:
> Do we want to verify the state after the 'hard' reset succeeds as
> well? Things like
>
> - all paths in the HEAD and all paths in the index are identical;
>
> - paths that do exist in the working tree are all identical to HEAD
> version; and
>
> - paths that do not exist in the working tree are missing due to
> the sparse checkout setting (iow, it is a bug if a path that is
> outside the "sparse" setting is missing from the working tree).
I implemented the additional check, it is a bit different
literally, but should be equivalent for this case
next prev parent reply other threads:[~2018-07-10 19:23 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-15 4:42 [PATCH] unpack-trees: do not fail reset because of unmerged skipped entry Max Kirillov
2018-06-15 19:58 ` Junio C Hamano
2018-06-16 8:22 ` Max Kirillov
2018-07-10 19:23 ` Max Kirillov [this message]
2018-06-16 5:14 ` Duy Nguyen
2018-07-10 19:21 ` Max Kirillov
2018-07-11 15:25 ` Duy Nguyen
2018-07-11 16:35 ` Junio C Hamano
2018-07-10 19:17 ` [PATCH v2] " Max Kirillov
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=20180710192309.GB2050@jessie.local \
--to=max@max630.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@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.
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).