contrib/mw-to-git/Git/Mediawiki.pm

contrib/mw-to-git/Git/Mediawiki.pm

[Torsten Bögershausen]

I just discovered a major problem for
Mac OS and Windows people:

In contrib/mw-to-git/ there is a file called "git".
And there is a directory called "Git".

This does not work very well on case insensitive file systems.
When the file "git" is created, we can not create a directory
called "Git", as "Git" is mapped to "git".
And vice versa.

Can we try to rename one of them ?


The other interesting thing is that git 1.8.3 didn't like the
situation:
After checking out the pu branch, 
git status says:
deleted:    contrib/mw-to-git/Git/Mediawiki.pm

So I could not change to another branch/commit...
git stash didn't resolve the situation either.

The following saved my repo:
git mv contrib/mw-to-git/git contrib/mw-to-git/git.exe
git checkout contrib/mw-to-git/Git/Mediawiki.pm
git checkout -b xxx_git_Git_conflict
git commit -a -m xxx_git_Git_conflict

/Torsten

Re: contrib/mw-to-git/Git/Mediawiki.pm

[Benoît Person]

Oops, so sorry :/

It's defintely doable since the lowercase 'git' is only a bin-wrapper
for git to ease development in contrib/mw-to-git/ .

Junio, Matthieu : should I resend a new version of my serie which
renames the 'git' (lowercase) file into something like 'git-dev' ?
(some comments directly mentionning the 'git' (lowercase) file needs
to be updated as well in the Makefile)

Benoit

Re: contrib/mw-to-git/Git/Mediawiki.pm

[Matthieu Moy]

Benoît Person <benoit.person@ensimag.fr> writes:

> Junio, Matthieu : should I resend a new version of my serie which
> renames the 'git' (lowercase) file into something like 'git-dev' ?

I'd call it bin-wrapper/git, so that people can put bin-wrapper/ in
their $PATH if needed, and by analogy with ../../bin-wrapper. If you go
this way, don't forget to update the $0 relative paths.

git-dev is OK with me too.

> (some comments directly mentionning the 'git' (lowercase) file needs
> to be updated as well in the Makefile)

Yes.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/

Re: contrib/mw-to-git/Git/Mediawiki.pm

[Junio C Hamano]

Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:

> Benoît Person <benoit.person@ensimag.fr> writes:
>
>> Junio, Matthieu : should I resend a new version of my serie which
>> renames the 'git' (lowercase) file into something like 'git-dev' ?
>
> I'd call it bin-wrapper/git, so that people can put bin-wrapper/ in
> their $PATH if needed, and by analogy with ../../bin-wrapper. If you go
> this way, don't forget to update the $0 relative paths.
>
> git-dev is OK with me too.
>
>> (some comments directly mentionning the 'git' (lowercase) file needs
>> to be updated as well in the Makefile)
>
> Yes.

I just noticed that the script is not strictly a text file, ending
with an incomplete line, by the way.

Re: contrib/mw-to-git/Git/Mediawiki.pm

[Benoît Person]

> Hmph.  Does it even need to be in-tree then?  Is it insufficient to
> run ../../git from that directory instead?
Well, the fact is we use Perl packages now (Git.pm and
Git::Mediawiki.pm in contrib/mw-to-git/Git/). The way we build perl
scripts in the toplevel's Makefile makes those packages accessible
only in $GITPERLLIB if it's defined and defaults to $INSTLIBDIR to
seek for installed version of those packages.

We use a bin-wrapper to define that $GITPERLLIB variable so that the
installed version gets bypassed by the one presents in the directory
defined in $GITPERLLIB.

> I just noticed that the script is not strictly a text file, ending
> with an incomplete line, by the way.
an incomplete line ?

Re: contrib/mw-to-git/Git/Mediawiki.pm

[Junio C Hamano]

Benoît Person <benoit.person@ensimag.fr> writes:

>> I just noticed that the script is not strictly a text file, ending
>> with an incomplete line, by the way.
> an incomplete line ?

http://pubs.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap03.html#tag_03_194

Re: contrib/mw-to-git/Git/Mediawiki.pm

[Junio C Hamano]

Benoît Person <benoit.person@ensimag.fr> writes:

> Oops, so sorry :/
>
> It's defintely doable since the lowercase 'git' is only a bin-wrapper
> for git to ease development in contrib/mw-to-git/ .

Hmph.  Does it even need to be in-tree then?  Is it insufficient to
run ../../git from that directory instead?

> Junio, Matthieu : should I resend a new version of my serie which
> renames the 'git' (lowercase) file into something like 'git-dev' ?
> (some comments directly mentionning the 'git' (lowercase) file needs
> to be updated as well in the Makefile)
>
> Benoit