Re: [msysGit] 1.8.2/1.8.3 version?

[Johannes Schindelin]

Hi alx,

On Fri, 17 May 2013, alx....@gmail.com wrote:

> I would like to use the new hook "pre-push"introduced in 1.8.2. Is there
> any ETA when a new version of msysGit will be released?

There is no ETA. As you probably know, Git for Windows is developed by
volunteers, just like yourself. So the more you can contribute to
upgrading to a new version, the sooner it will be there.

Ciao,
Johannes

[Philip Oakley]

----- Original Message -----

From: alx....@gmail.com

To: msy...@googlegroups.com

Cc: alx....@gmail.com

Sent: Saturday, May 18, 2013 1:21 AM

Subject: Re: [msysGit] 1.8.2/1.8.3 version?

On Friday, May 17, 2013 9:09:50 PM UTC, Johannes Schindelin wrote:

There is no ETA. As you probably know, Git for Windows is developed by
volunteers, just like yourself. So the more you can contribute to
upgrading to a new version, the sooner it will be there.

Sure no problem. How the git submodule in msysgit is usually updated/maintained? How much specifics changes have been done in msysgit/git?
I tried a pull rebase on this git submodule, but there is hundreds of conflicts, so It seems that this submodule has been already heavily merged and is not usually rebased from git?
I also tried to pull merge from git/git,but there are still dozens of conflicts and some of them seems to require some knowledge about the changes done in msysgit.
Let me know how you are usually working when upgrading to a new version, there are probably some obvious steps I have missed.

The latest release candidate (for Linux) was announced last night http://article.gmane.org/gmane.linux.kernel/1492987

 

Once the v1.8.3 is released (next weekend 28-May?), then IIUC the guy(s) will [when they have time] do a merging rebase (or is that a rebasing merge) to apply the varoius msysgit fixes to the linux base and it is then automatically tested by a CI server to see if it passes the various tests.

 

if it passes, and they have sufficient time, the rest of the release process continues to produce the 'official' review release.

 

Philip

[Johannes Schindelin]

Hi Philip,

On Sat, 18 May 2013, Philip Oakley wrote:

> Once the v1.8.3 is released (next weekend 28-May?), then IIUC the guy(s)
> will [when they have time] do a merging rebase (or is that a rebasing
> merge) to apply the varoius msysgit fixes to the linux base and it is
> then automatically tested by a CI server to see if it passes the various
> tests.
>
> if it passes, and they have sufficient time, the rest of the release
> process continues to produce the 'official' review release.

s/the guy(s)/everybody who is willing to contribute/

s/they/we/

Ciao,
Johannes

[Johannes Schindelin]

Hi,

On Sun, 19 May 2013, alx....@gmail.com wrote:

> Nevermind, at least I have been able to cherry pick the commits that are
> providing pre-push hooks, so I will probably stick with this temporary
> solution for now. Seems a bit less laborious than going to a full rebase.

Thought so. In case you're seriously interested in a proper fix, there are
quite a number of mails on this mailing list talking about the merging
rebase, one even pointing to my G+ post about it.

Ciao,
Johannes