git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [msysGit] Re: [PATCH 02/11] Fix declare variable at mid of function

From
Johannes Sixt <j.sixt@viscovery.net>
Date
Aug 19, 2009, 10:55 UTC
Message-ID
<4A8BDA2A.9030105@viscovery.net>
In-Reply-To
<alpine.DEB.1.00.0908191158310.5594@intel-tinevez-2-302>
Johannes Schindelin schrieb:
Show 10 quoted lines
> On Wed, 19 Aug 2009, Frank Li wrote:
>> I have push my change to tgit
>> git://repo.or.cz/tgit.git
>> branch vcpatch2
>>
>> How do I know if patch has been applied main line?
> 
> I applied them to 4msysgit.git's devel.  Note that I had a strange merge 
> conflict in pager.c: you replaced and #ifndef __MINGW32__ with an #ifndef 
> WIN32, but I don't have that #ifndef at all.

4msysgit has my "Windows: Better support PAGER settings with spaces in the path", which removes the #ifndefs, Frank's version doesn't have it. Therefore, you should not rebase Frank's patches on top of 4msysgit's master or devel before they are merged into git.git.

-- Hannes
Previous: Johannes SchindelinNext: Johannes Schindelin
Message 19 of 26 in “Fix build failure at VC because function declare use old style at regex.c”
  1. 01/11 Fix build failure at VC because function declare use old style at regex.cFrank Li, Aug 17, 2009
  2. 02/11 Fix declare variable at mid of functionFrank Li, Aug 17, 2009
  3. 03/11 Define SNPRINTF_SIZE_CORR 1 when use MSVC build gitFrank Li, Aug 17, 2009
  4. 04/11 Add _MSC_VER predefine macro to make same behaviors with __MINGW32__ Enable MSVC build. MSVC have the save behaviors with msysgit.Frank Li, Aug 17, 2009
  5. Johannes SchindelinAug 17, 2009
  6. Frank LiAug 18, 2009
  7. tom fogalAug 18, 2009
  8. Johannes SchindelinAug 17, 2009
  9. Frank LiAug 18, 2009
  10. Johannes SchindelinAug 18, 2009
  11. Johannes SchindelinAug 17, 2009
  12. Reece DunnAug 17, 2009
  13. Johannes SchindelinAug 17, 2009
  14. Marius Storm-OlsenAug 18, 2009
  15. Johannes SchindelinAug 18, 2009
  16. Frank LiAug 18, 2009
  17. Matthieu MoyAug 18, 2009
  18. Johannes SchindelinAug 19, 2009
  19. Johannes SixtAug 19, 2009
  20. Johannes SchindelinAug 19, 2009
  21. Johannes SixtAug 19, 2009
  22. Junio C HamanoAug 17, 2009
  23. Johannes SchindelinAug 17, 2009
  24. Junio C HamanoAug 17, 2009
  25. Johannes SchindelinAug 17, 2009
  26. Frank LiAug 18, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.