From: Thomas Rast <trast@student.ethz.ch>
To: Thomas Rast <trast@student.ethz.ch>
Cc: <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>,
Thomas Gummerer <t.gummerer@gmail.com>
Subject: Re: [RFC/PATCH] Only call record_resolve_undo() when coming from add/rm
Date: Sat, 21 Jul 2012 00:22:51 +0200 [thread overview]
Message-ID: <87liievzr8.fsf@thomas.inf.ethz.ch> (raw)
In-Reply-To: <e0e9ce3599d898c974c56c818d9858638e343f5b.1342819276.git.trast@student.ethz.ch> (Thomas Rast's message of "Fri, 20 Jul 2012 23:28:48 +0200")
Thomas Rast <trast@student.ethz.ch> writes:
> Thomas and me discovered this while hacking on index-v5. It would be
> a bit tricky to handle there: the index is structured according to the
> directory layout of the files it contains, and the REUC data is the
> same as the conflict (stages) data plus a flag bit, for (future)
> easier toggling between them. With the behavior before this patch, it
> is possible to have directories that do not have any "live" files, yet
> contain REUC records. For example, in git.git,
>
> $ git checkout 8e17b34c33^1
> $ git merge 8e17b34c33^2
> $ g ls-files -s | grep arpa
> $ g ls-files --resolve-undo | grep arpa
> 100644 0d8552a2c6dc3a5fee5360ea2ff468463461e3bf 1 compat/vcbuild/include/arpa/inet.h
> 100644 0d8552a2c6dc3a5fee5360ea2ff468463461e3bf 3 compat/vcbuild/include/arpa/inet.h
We just discovered that this merge is no longer in current git.git. It
went into master as b7f7c079, and the example works with that.
--
Thomas Rast
trast@{inf,student}.ethz.ch
next prev parent reply other threads:[~2012-07-20 22:23 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-20 21:28 [RFC/PATCH] Only call record_resolve_undo() when coming from add/rm Thomas Rast
2012-07-20 22:22 ` Thomas Rast [this message]
2012-07-22 18:37 ` Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87liievzr8.fsf@thomas.inf.ethz.ch \
--to=trast@student.ethz.ch \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=t.gummerer@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.
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 NNTP newsgroup(s).