Re: [PATCH 01/12] Introduce Git.pm (v4)

From: Junio C Hamano <junkio@cox.net>
Date: Jun 24, 2006, 08:33 UTC
Message-ID: <7vu06bymtr.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <7vr71f5kzs.fsf@assigned-by-dhcp.cox.net>

Junio C Hamano <junkio@cox.net> writes:

Show 9 quoted lines

> Just to let you know, I already have v3 in my tree which is
> merged in "pu".  With the two fixes I sent you earlier I think
> it is in a good shape to be cooked in "next".
>
> I do not think I'd have trouble applying this new series (I
> would probably start from "master" to apply it and perhaps merge
> or --squash merge it onto pb/gitpm topic branch that has v3 with
> the two fixes I sent you separately) but we will see soon
> enough.

EEEEEEEEEK.

git-fmt-merge-msg failed and git-pull did not notice it and went ahead to call git-merge with an empty log message. This screwed up my tree rather big way.

The reason it failed? Well, it could not find Git.pm because the changes to fmt-merge-msg was done for distros not for people who install under their home directories.

Now, I am quite unhappy about the situation (and it is not your fault). "git pull" is something almost everybody uses, and having the series means they would need to make sure whereever Git.pm is installed is on their PERL5LIB as things currently stand.

In the case of git-merge-recursive.py, Fredrik does

	sys.path.append('''@@GIT_PYTHON_PATH@@''')

and while running test this invalid path is overridden by having PYTHONPATH environment variable. Since it is "append", the test picks up the freshly built version, not the version from the previous install (i.e. PYTHONPATH environment variable wins).

So you would probably want to have something like

	use lib '@@GIT_PERL_PATH@@';

inside git-fmt-merge-msg.perl, which will be turned into

	use lib '/home/junio/some/where/you/install/pm';

in git-fmt-merge-msg and things might start working.

... gitster mumbles something in his mouth, and in a puff of smoke Merlyn appears and solves all our Perl problems ;-) ...