From: Junio C Hamano <junkio@cox.net>
Date: Thu, 07 Dec 2006 22:36:40 GMT
Subject: Re: Commit f84871 breaks build on OS X
Message-ID: <7vmz5zqqo7.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <86ejrbihnr.fsf@blue.stonehenge.com>

merlyn@stonehenge.com (Randal L. Schwartz) writes:

>>>>>> "Alex" == Alex Riesen <raa.lkml@gmail.com> writes:
>
> Alex> Strange. You seem to have the old, generated Makefile you perl/
> Alex> directory. Haven't your pull failed? If so, I suspect that
>
> Alex>  rm perl/Makefile
> Alex>  git reset --hard
> Alex>  git pull git...
>
> I ended up having to do another reset afterward.
>
> Definitely something went weird when Makefile was removed
> from .gitignore.

Yes, perl/Makefile is getting overwritten by what Makefile.PL
generates.  I thought the point of Alex's patch was to have it
muck with perl.mak and leave the tracked Makefile alone?