From: Linus Torvalds <torvalds@linux-foundation.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jeff King <peff@peff.net>,
Nicolas Sebrecht <nicolas.s.dev@gmx.fr>,
git@vger.kernel.org
Subject: Re: [test failure] Re: t4114 binary file becomes symlink
Date: Sat, 18 Jul 2009 16:18:45 -0700 (PDT) [thread overview]
Message-ID: <alpine.LFD.2.01.0907181612390.13838@localhost.localdomain> (raw)
In-Reply-To: <7veisd3k31.fsf@alter.siamese.dyndns.org>
On Sat, 18 Jul 2009, Junio C Hamano wrote:
>
> The unpack_trees() machinery places a special marker df_conflict_entry
> to signal that no blob exists at "foo", but it will become a directory
> that may have somthing underneath it, namely "foo/bar".
>
> Passing that df_conflict_entry marker to merged_entry() happens to remove
> the "foo" in the end because the df_conflict_entry does not have any name
> (hence the "error" message) and its addition in add_index_entry() is
> rejected, but it is wrong.
Ack. This looks like a really old bug.
That whole 'df_conflict_entry' always confused me.
Linus
next prev parent reply other threads:[~2009-07-18 23:20 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-18 13:45 [test failure] t4114 binary file becomes symlink Nicolas Sebrecht
2009-07-18 13:56 ` Jeff King
2009-07-18 14:16 ` [test failure] " Nicolas Sebrecht
2009-07-18 15:31 ` Jeff King
2009-07-18 18:46 ` Junio C Hamano
2009-07-18 20:39 ` Nicolas Sebrecht
2009-07-18 23:18 ` Linus Torvalds [this message]
2009-07-18 19:06 ` Johannes Sixt
2009-07-18 20:17 ` Nicolas Sebrecht
2009-07-18 21:13 ` Nicolas Sebrecht
2009-07-19 10:33 ` ./configure misdetects SNPRINTF_RETURNS_BOGUS (was: [test failure] t4114 binary file becomes symlink) Jakub Narebski
2009-07-19 12:48 ` [PATCH] configure: use AC_SEARCH_LIBS instead of AC_CHECK_LIB Nicolas Sebrecht
2009-07-19 13:14 ` [PATCH] " Nicolas Sebrecht
2009-07-19 16:13 ` Junio C Hamano
2009-07-19 22:53 ` Eric Blake
2009-07-21 15:04 ` [PATCH] " Brandon Casey
2009-07-21 15:12 ` Brandon Casey
2009-07-21 15:20 ` Paolo Bonzini
2009-07-21 15:34 ` Brandon Casey
2009-07-21 20:23 ` [PATCH] configure.ac: rework/fix the NEEDS_RESOLV and NEEDS_LIBGEN tests Brandon Casey
2009-07-21 20:33 ` Junio C Hamano
2009-07-22 14:59 ` Brandon Casey
2009-07-22 22:15 ` [PATCH] config.mak.in: continue fixing NEEDS_LIBGEN autoconfigure feature Brandon Casey
2009-07-22 22:35 ` Junio C Hamano
2009-07-23 16:22 ` Brandon Casey
2009-07-18 22:03 ` [test failure] Re: t4114 binary file becomes symlink Johannes Sixt
2009-07-18 22:29 ` Jeff King
2009-07-18 22:51 ` Nicolas Sebrecht
2009-07-19 11:01 ` Johannes Sixt
2009-07-20 9:09 ` Jeff King
2009-07-20 20:51 ` Johannes Sixt
2009-07-20 21:56 ` Linus Torvalds
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=alpine.LFD.2.01.0907181612390.13838@localhost.localdomain \
--to=torvalds@linux-foundation.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=nicolas.s.dev@gmx.fr \
--cc=peff@peff.net \
/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).