{"thread":{"id":"47074","subject":"[PATCH] mingw: include the full version information in the resources","startedAt":"2017-10-30T17:19:54Z","lastAt":"2017-10-30T17:19:54Z","messageCount":1,"participants":["Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"331372","messageId":"d6447dddb2a5196c3785ef7b758764d7873e3153.1509383748.git.johannes.schindelin@gmx.de","threadId":"47074","inReplyTo":null,"subject":"[PATCH] mingw: include the full version information in the resources","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2017-10-30T17:19:42Z","receivedAt":"2017-10-30T17:19:54Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"This fixes https://github.com/git-for-windows/git/issues/723\n\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n\n\tThis patch has been carried in Git for Windows in this form since\n\tGit for Windows v2.11.0(2). It seems to be ready for prime time.\n\n\tI could just imagine *one* change: to use\n\n\t\ttr -d 0-9 ' '\n\n\tinstead of\n\n\t\ttr '.a-zA-Z-' ' '\n\n\tHowever, I am reluctant to do that, as any character that is not\n\tcaught by this pattern would be indicative of something really\n\tfunny going on.\n\n\tPlus, I have had really bad experience with changing a well-tested\n\tpatch series just to get it into core Git, only to see an\n\timmediate breakage introduced to appease reviews. Therefore, this\n\ttime around I will need to be convinced quite a bit more if I am to\n\trisk breakages.\n\n Makefile | 3 ++-\n git.rc   | 4 ++--\n 2 files changed, 4 insertions(+), 3 deletions(-)\n\ndiff --git a/Makefile b/Makefile\nindex cd75985991f..ee9d5eb11ee 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -1940,7 +1940,8 @@ $(SCRIPT_LIB) : % : %.sh GIT-SCRIPT-DEFINES\n \n git.res: git.rc GIT-VERSION-FILE\n \t$(QUIET_RC)$(RC) \\\n-\t  $(join -DMAJOR= -DMINOR=, $(wordlist 1,2,$(subst -, ,$(subst ., ,$(GIT_VERSION))))) \\\n+\t  $(join -DMAJOR= -DMINOR= -DMICRO= -DPATCHLEVEL=, $(wordlist 1, 4, \\\n+\t    $(shell echo $(GIT_VERSION) 0 0 0 0 | tr '.a-zA-Z-' ' '))) \\\n \t  -DGIT_VERSION=\"\\\\\\\"$(GIT_VERSION)\\\\\\\"\" -i $< -o $@\n \n # This makes sure we depend on the NO_PERL setting itself.\ndiff --git a/git.rc b/git.rc\nindex 33aafb786cf..49002e0d541 100644\n--- a/git.rc\n+++ b/git.rc\n@@ -1,6 +1,6 @@\n 1 VERSIONINFO\n-FILEVERSION     MAJOR,MINOR,0,0\n-PRODUCTVERSION  MAJOR,MINOR,0,0\n+FILEVERSION     MAJOR,MINOR,MICRO,PATCHLEVEL\n+PRODUCTVERSION  MAJOR,MINOR,MICRO,PATCHLEVEL\n BEGIN\n   BLOCK \"StringFileInfo\"\n   BEGIN\n\nbase-commit: cb5918aa0d50f50e83787f65c2ddc3dcb10159fe\n-- \n2.15.0.windows.1\n\nPublished-As: https://github.com/dscho/git/releases/tag/resource-version-v1\nFetch-It-Via: git fetch https://github.com/dscho/git resource-version-v1\n"}]}