Re: [msysGit] Re: [PATCH v4] MinGW(-W64) compilation

2014-10-08 Thread Johannes Schindelin
Hi Marat,

On Wed, 8 Oct 2014, Marat Radchenko wrote:

 On Wed, Oct 08, 2014 at 01:09:20AM +0200, Thomas Braun wrote:

  I wanted to verify that on msysgit but some patches fail to apply
  cleanly. Did you also had to tweak the patches?
  If yes, are these tweaked patches still available somewhere?
 
 msysgit != git-for-windows, as msysgit folks say.

That's not what msysgit folks say (they say that msysgit is the
development environment to build Git for Windows [*1*]), and Thomas is
well aware of the situation because he is a busy contributor on the
Windows side.

 I tested my patches by applying them to git.git/master and building
 inside msysgit.

So the idea would be to rebase from git/git/master onto
msysgit/git/master. Did you do that yet?

Ciao,
Johannes

Footnote *1*: msysgit is about to be phased out. As soon as
https://github.com/git-for-windows/sdk is able to produce a Git for
Windows installer (it already able to build Git and pass the test suite),
we will switch to the new development environment and mark msysgit as
obsolete, keeping it around only for reference.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [msysGit] Re: [PATCH v4] MinGW(-W64) compilation

2014-10-08 Thread Marat Radchenko
On Wed, Oct 08, 2014 at 10:59:57AM +0200, Johannes Schindelin wrote:
 Hi Marat,
 
 On Wed, 8 Oct 2014, Marat Radchenko wrote:
 
 That's not what msysgit folks say (they say that msysgit is the
 development environment to build Git for Windows [*1*]).

Aaargh! msys != msysgit != Git for Windows SDK != Git for Windows != 
mingwGitDevEnv
and possibly != git-for-windows.

Oh, there's also mingw-w64-git from msys2 [1].

  I tested my patches by applying them to git.git/master and building
  inside msysgit.
 
 So the idea would be to rebase from git/git/master onto
 msysgit/git/master. Did you do that yet?

No, what for? Windows flavors of Git are already fragmented too much,
my patchset is deliberately targeted at Git upstream.

[1] https://github.com/Alexpux/MINGW-packages/tree/master/mingw-w64-git
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [msysGit] Re: [PATCH v4] MinGW(-W64) compilation

2014-10-08 Thread Johannes Schindelin
Hi Thomas,

On Wed, 8 Oct 2014, Thomas Braun wrote:

 I wanted to verify that on msysgit but some patches fail to apply
 cleanly. Did you also had to tweak the patches?

I applied the patches to git-for-windows/git's master, manually fixing
three of them, and pushed the result to the 'w64' branch in my fork.
Please find them here:

https://github.com/dscho/git/compare/git-for-windows:master...w64

and rebased onto msysgit's master:

https://github.com/dscho/git/compare/msysgit:master...w64-msysgit

Ciao,
Dscho
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [msysGit] Re: [PATCH v4] MinGW(-W64) compilation

2014-10-08 Thread Johannes Schindelin
Hi Marat,

On Wed, 8 Oct 2014, Marat Radchenko wrote:

 On Wed, Oct 08, 2014 at 10:59:57AM +0200, Johannes Schindelin wrote:

  So the idea would be to rebase from git/git/master onto
  msysgit/git/master. Did you do that yet?
 
 No, what for?

To work together?

If you are not interested in working together to make Git on 64-bit
Windows kick-ass, just say so.

Ciao,
Johannes
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [msysGit] Re: [PATCH v4] MinGW(-W64) compilation

2014-10-06 Thread Johannes Sixt
Am 06.10.2014 um 07:17 schrieb Marat Radchenko:
 On Tue, Sep 30, 2014 at 11:02:29AM +0400, Marat Radchenko wrote:
 This patch series fixes building on modern MinGW and MinGW-W64 (including 
 x86_64!).
 
 Junio, ping?
 

Sorry, I forgot to report that this updated series works now for me.

The patches all look reasonable. I don't have an opinion on the
restriction that MSVC  2010 can't be used anymore (path 08/14).

-- Hannes

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html