From: Christian Couder <chriscool@tuxfamily.org>
To: Alexander Gladysh <agladysh@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Cherry-pick with symlinks fails horribly
Date: Fri, 12 Mar 2010 04:48:22 +0100 [thread overview]
Message-ID: <201003120448.22821.chriscool@tuxfamily.org> (raw)
In-Reply-To: <c6c947f61003110416l40a85b6fg7ede2403a8f6961b@mail.gmail.com>
On Thursday 11 March 2010 13:16:09 Alexander Gladysh wrote:
> On Thu, Mar 11, 2010 at 07:57, Christian Couder <chriscool@tuxfamily.org>
wrote:
> > On Tuesday 09 March 2010 02:28:30 Alexander Gladysh wrote:
> >> I'm complaining about Git symlink handling again. This time it is
> >> cherry-pick.
> >
> > I can reproduce the bug here on Linux. And Git v1.6.0 has the same bug.
> > So I suspect an old bug in unpack_trees.c. I will try to have another
> > look at it this evening, but I am not familiar with that code.
>
> I have found my old bug-report. There is even some patch in that thread.
>
> http://thread.gmane.org/gmane.comp.version-control.git/120741/
>
> Not sure if it is the same issue or if the patch was even merged in
> though...
The patch was merged:
commit 77716755cbdf970fa0814a5f77c884b1f17693de
Author: Kjetil Barvik <barvik@broadpark.no>
Date: Sun Jun 14 15:08:28 2009 +0200
lstat_cache: guard against full match of length of 'name' parameter
so I think it is a different issue, but feel free to test.
Anyway when looking at t/t6035-merge-dir-to-symlink.sh, we can see that there
are still 2 broken tests:
$ ./t6035-merge-dir-to-symlink.sh
* ok 1: create a commit where dir a/b changed to symlink
* ok 2: keep a/b-2/c/d across checkout
* ok 3: checkout should not have deleted a/b-2/c/d
* ok 4: setup for merge test
* ok 5: do not lose a/b-2/c/d in merge (resolve)
* still broken 6: do not lose a/b-2/c/d in merge (recursive)
* ok 7: setup a merge where dir a/b-2 changed to symlink
* ok 8: merge should not have conflicts (resolve)
* still broken 9: merge should not have conflicts (recursive)
* still have 2 known breakage(s)
* passed all remaining 7 test(s)
So it looks like breakages in this area are known, though perhaps not your
particular breakage.
Best regards,
Christian.
next prev parent reply other threads:[~2010-03-12 3:51 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-09 1:28 Cherry-pick with symlinks fails horribly Alexander Gladysh
2010-03-10 18:54 ` Alexander Gladysh
2010-03-11 4:57 ` Christian Couder
2010-03-11 12:16 ` Alexander Gladysh
2010-03-12 3:48 ` Christian Couder [this message]
2010-03-12 5:49 ` Junio C Hamano
2010-03-25 5:01 ` Christian Couder
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=201003120448.22821.chriscool@tuxfamily.org \
--to=chriscool@tuxfamily.org \
--cc=agladysh@gmail.com \
--cc=git@vger.kernel.org \
/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).