This repository was archived by the owner on Nov 9, 2017. It is now read-only.
Repository navigation
Attempted fix for issue with context-menu entries on XPx64/Server2003x64 - #12
Merged
Merged
Conversation
Member
|
Looking good, I'd like someone to verify that it still works with 32-bit Windows, though. Unfortunately, I am really bogged down with work in preparation for a well-needed vacation next week... Pending confirmation that 32-bit is not broken, I am all for merging this! |
Contributor
|
I know I'm picky, but please consistently use or not use spaces around "+". As we're usually not using them, please remove them also in your patch. Otherwise it looks fine to me. |
Member
|
And please test the installer to be sure. I can test xp 32bit after the weekend. If you need help compiling the installer please let me know. Thanks. |
Member
|
I tested it today and there is a backslash missing in the installed registry entry: "C:\WINDOWS\system32wscript" "C:\Program Files\Git\Git Bash.vbs" "%1" Thats why I said please test to be sure. Once you have adjusted your patch according to the comments here and tested the change please update this pull request. |
ghost
assigned
Member
|
As a result of recent discussion on the list https://groups.google.com/forum/#!topic/msysgit/MRqQQb9vRUM Please also add a Signed-off-by line to your commit. |
Contributor
Author
|
I've added a signed-off-by line, addressed the missing backslash and the extra spaces around +. Have a local msysgit install now (the first commit was done using the github web interface after I solved that stackoverflow problem - have contacted GitHub suggesting Signed-off-by line button for web interface) and will be attempting to test it. I only have 64-bit machines to test on, however. Do you prefer that I test with what the netinstaller set up (which included updated versions of the submodules) or with stock submodules from the branch point? |
Member
|
Once you verified that it works for you on 64-bit I can give it another test run on XP 32-bit. I would prefer that you use |
Contributor
Author
|
OK, tested on Windows 7 x64 - the registry entry looks good, and the context menu works (though I get a "your msys-1.0.dll is out of date" message which I assume is because of the nature of my test build). The registry entry now matches what I used here https://github.com/rpavlik/git-windows-mintty/blob/master/setup.iss#L61 (and the manual fix I made with a registry file) which was verified to work on WinXP x64. |
Member
|
Ok, I have have verified that this works on Windows XP 32-Bit. Although I get a warning: "ERROR: Your msys-1.0.dll is out-of-date!" from the installed bash but that is probably an unrelated issue. Anyone else any objections? |
|
Just for info, I also get the "ERROR: Your msys-1.0.dll is out-of-date!" |
Member
Member
|
Ok merged and pushed. |
mikofski
added a commit
to mikofski/msysgit
that referenced
this pull request
Jun 7, 2012
use %WINDIR%\SysWOW64\cmd /C to run "sh.exe --login %1 %*"
use {syswow64} variable to determine which cmd to use
addresses issue msysgit#12
Signed-off-by: Mark Mikofski <[email protected]>
toshiyuki-ogawa
pushed a commit
to toshiyuki-ogawa/msysgit
that referenced
this pull request
May 3, 2013
This has the effect of increasing the address space from 2GB to 4GB under 64-bit Windows, reducing the likelihood of an "out of memory" error when e.g. repacking a large repository. The test suite passes with this patch, with and without the MEM_TOP_DOWN flag added to all VirtualAlloc calls. While this is no guarantee that there are no issues with large memory support (it could break Git on other setups than mine, for example), it at least increases the chance that nothing obvious goes wrong (such as errors introduced by faulty sign extension, say, with ssize_t). [PT: Resolves github issue msysgit#12] Signed-off-by: Pierre le Riche <[email protected]> Signed-off-by: Pat Thoyts <[email protected]>
toshiyuki-ogawa
pushed a commit
to toshiyuki-ogawa/msysgit
that referenced
this pull request
May 3, 2013
…e makefile. Use this commit message, rewrapped to 76 columns: msysgit: Add the --large-address-aware linker directive to the makefile. This has the effect of increasing the address space from 2GB to 4GB under 64-bit Windows, reducing the likelihood of an "out of memory" error when e.g. repacking a large repository. The test suite passes with this patch, with and without the MEM_TOP_DOWN flag added to all VirtualAlloc calls. While this is no guarantee that there are no issues with large memory support (it could break Git on other setups than mine, for example), it at least increases the chance that nothing obvious goes wrong (such as errors introduced by faulty sign extension, say, with ssize_t). [PT: Resolves github issue msysgit#12] Signed-off-by: Pierre le Riche <[email protected]> Signed-off-by: Pat Thoyts <[email protected]>
toshiyuki-ogawa
pushed a commit
to toshiyuki-ogawa/msysgit
that referenced
this pull request
May 3, 2013
This has the effect of increasing the address space from 2GB to 4GB under 64-bit Windows, reducing the likelihood of an "out of memory" error when e.g. repacking a large repository. The test suite passes with this patch, with and without the MEM_TOP_DOWN flag added to all VirtualAlloc calls. While this is no guarantee that there are no issues with large memory support (it could break Git on other setups than mine, for example), it at least increases the chance that nothing obvious goes wrong (such as errors introduced by faulty sign extension, say, with ssize_t). [PT: Resolves github issue msysgit#12] Signed-off-by: Pierre le Riche <[email protected]> Signed-off-by: Pat Thoyts <[email protected]>
toshiyuki-ogawa
pushed a commit
to toshiyuki-ogawa/msysgit
that referenced
this pull request
May 3, 2013
This has the effect of increasing the address space from 2GB to 4GB under 64-bit Windows, reducing the likelihood of an "out of memory" error when e.g. repacking a large repository. The test suite passes with this patch, with and without the MEM_TOP_DOWN flag added to all VirtualAlloc calls. While this is no guarantee that there are no issues with large memory support (it could break Git on other setups than mine, for example), it at least increases the chance that nothing obvious goes wrong (such as errors introduced by faulty sign extension, say, with ssize_t). [PT: Resolves github issue msysgit#12] Signed-off-by: Pierre le Riche <[email protected]> Signed-off-by: Pat Thoyts <[email protected]>
toshiyuki-ogawa
pushed a commit
to toshiyuki-ogawa/msysgit
that referenced
this pull request
May 3, 2013
This has the effect of increasing the address space from 2GB to 4GB under 64-bit Windows, reducing the likelihood of an "out of memory" error when e.g. repacking a large repository. The test suite passes with this patch, with and without the MEM_TOP_DOWN flag added to all VirtualAlloc calls. While this is no guarantee that there are no issues with large memory support (it could break Git on other setups than mine, for example), it at least increases the chance that nothing obvious goes wrong (such as errors introduced by faulty sign extension, say, with ssize_t). [PT: Resolves github issue msysgit#12] Signed-off-by: Pierre le Riche <[email protected]> Signed-off-by: Pat Thoyts <[email protected]>
toshiyuki-ogawa
pushed a commit
to toshiyuki-ogawa/msysgit
that referenced
this pull request
May 3, 2013
This has the effect of increasing the address space from 2GB to 4GB under 64-bit Windows, reducing the likelihood of an "out of memory" error when e.g. repacking a large repository. The test suite passes with this patch, with and without the MEM_TOP_DOWN flag added to all VirtualAlloc calls. While this is no guarantee that there are no issues with large memory support (it could break Git on other setups than mine, for example), it at least increases the chance that nothing obvious goes wrong (such as errors introduced by faulty sign extension, say, with ssize_t). [PT: Resolves github issue msysgit#12] Signed-off-by: Pierre le Riche <[email protected]> Signed-off-by: Pat Thoyts <[email protected]>
toshiyuki-ogawa
pushed a commit
to toshiyuki-ogawa/msysgit
that referenced
this pull request
May 3, 2013
This has the effect of increasing the address space from 2GB to 4GB under 64-bit Windows, reducing the likelihood of an "out of memory" error when e.g. repacking a large repository. The test suite passes with this patch, with and without the MEM_TOP_DOWN flag added to all VirtualAlloc calls. While this is no guarantee that there are no issues with large memory support (it could break Git on other setups than mine, for example), it at least increases the chance that nothing obvious goes wrong (such as errors introduced by faulty sign extension, say, with ssize_t). [PT: Resolves github issue msysgit#12] Signed-off-by: Pierre le Riche <[email protected]> Signed-off-by: Pat Thoyts <[email protected]>
toshiyuki-ogawa
pushed a commit
to toshiyuki-ogawa/msysgit
that referenced
this pull request
May 3, 2013
This has the effect of increasing the address space from 2GB to 4GB under 64-bit Windows, reducing the likelihood of an "out of memory" error when e.g. repacking a large repository. The test suite passes with this patch, with and without the MEM_TOP_DOWN flag added to all VirtualAlloc calls. While this is no guarantee that there are no issues with large memory support (it could break Git on other setups than mine, for example), it at least increases the chance that nothing obvious goes wrong (such as errors introduced by faulty sign extension, say, with ssize_t). [PT: Resolves github issue msysgit#12] Signed-off-by: Pierre le Riche <[email protected]> Signed-off-by: Pat Thoyts <[email protected]>
toshiyuki-ogawa
pushed a commit
to toshiyuki-ogawa/msysgit
that referenced
this pull request
May 3, 2013
This has the effect of increasing the address space from 2GB to 4GB under 64-bit Windows, reducing the likelihood of an "out of memory" error when e.g. repacking a large repository. The test suite passes with this patch, with and without the MEM_TOP_DOWN flag added to all VirtualAlloc calls. While this is no guarantee that there are no issues with large memory support (it could break Git on other setups than mine, for example), it at least increases the chance that nothing obvious goes wrong (such as errors introduced by faulty sign extension, say, with ssize_t). [PT: Resolves github issue msysgit#12] Signed-off-by: Pierre le Riche <[email protected]> Signed-off-by: Pat Thoyts <[email protected]>
toshiyuki-ogawa
pushed a commit
to toshiyuki-ogawa/msysgit
that referenced
this pull request
May 3, 2013
This has the effect of increasing the address space from 2GB to 4GB under 64-bit Windows, reducing the likelihood of an "out of memory" error when e.g. repacking a large repository. The test suite passes with this patch, with and without the MEM_TOP_DOWN flag added to all VirtualAlloc calls. While this is no guarantee that there are no issues with large memory support (it could break Git on other setups than mine, for example), it at least increases the chance that nothing obvious goes wrong (such as errors introduced by faulty sign extension, say, with ssize_t). [PT: Resolves github issue msysgit#12] Signed-off-by: Pierre le Riche <[email protected]> Signed-off-by: Pat Thoyts <[email protected]>
vbjay
pushed a commit
to vbjay/msysgit
that referenced
this pull request
Jun 4, 2013
This has the effect of increasing the address space from 2GB to 4GB under 64-bit Windows, reducing the likelihood of an "out of memory" error when e.g. repacking a large repository. The test suite passes with this patch, with and without the MEM_TOP_DOWN flag added to all VirtualAlloc calls. While this is no guarantee that there are no issues with large memory support (it could break Git on other setups than mine, for example), it at least increases the chance that nothing obvious goes wrong (such as errors introduced by faulty sign extension, say, with ssize_t). [PT: Resolves github issue msysgit#12] Signed-off-by: Pierre le Riche <[email protected]> Signed-off-by: Pat Thoyts <[email protected]>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
See http://stackoverflow.com/questions/10450550/msysgit-fork-cant-reserve-memory-for-stack/10639268#10639268
I did not test this, however, I made a similar adaptation in my project https://github.com/rpavlik/git-windows-mintty/blob/master/setup.iss#L61 that both fixed the issue on XP x64, and works correctly on Win7 x64.