Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

git flow update to 1.10.2 #1092

Closed
vielhuber opened this issue Mar 15, 2017 · 4 comments
Closed

git flow update to 1.10.2 #1092

vielhuber opened this issue Mar 15, 2017 · 4 comments
Assignees
@dscho
Milestone
v2.12.1

Comments

@vielhuber
Copy link

vielhuber commented Mar 15, 2017 •
edited
Loading

According to this issue, I need to update git flow to 1.10.2:
petervanderdoes/gitflow-avh#290

In the current version 2.12.0 of "git-for-windows" there is 1.10.1 of git flow included.
Can you please include the current version in the next release?
@shiftkey
Copy link

@vielhuber the source for this package is here https://github.com/git-for-windows/MSYS2-packages/blob/master/git-flow/PKGBUILD

I suspect a simple PR to update the pkgver to the right tag is all you need to do here. There's CI setup to test that everything is packaged fine...

@vielhuber
Copy link
Author

@shiftkey thanks for your information.
Is this correct? git-for-windows/MSYS2-packages#20
If the maintainer of MSYS2-packages now includes my pull, what happens next?

@shiftkey
Copy link

@vielhuber once it's merged, the release process for Git for Windows includes git-flow along with some other core packages here when it creates it's installers.

There's another step in the middle around publishing the new package to bintray, but I'm pretty sure that's mostly automated.

@dscho
Copy link
Member

dscho commented Mar 17, 2017

@shiftkey almost. I had to create the package on BinTray first, and since that is a rare task, I do not have automated it (https://xkcd.com/1205/).

Unfortunately, I just realized that the PKGBUILD needs some love: it tracks the master branch instead of going for tagged revisions.

@dscho dscho self-assigned this Mar 17, 2017
@dscho dscho added this to the v2.12.1 milestone Mar 17, 2017
dscho added a commit to git-for-windows/build-extra that referenced this issue Mar 17, 2017
@dscho
Mention New Feature in release notes
21ed396 
Comes with Git-Flow
[v1.10.2](https://github.com/petervanderdoes/gitflow-avh/blob/1.10.2/Changes.mdown#1102)
(addressing [#1092](git-for-windows/git#1092)
via [this Pull
Request](git-for-windows/MSYS2-packages#20)).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
benpeart pushed a commit that referenced this issue Jan 18, 2018
@dscho
Merge tag 'v2.12.1.windows.1' into users/johasc/gvfs/merge-2.12.1
04c4126 
Git for Windows v2.12.1

Changes since Git for Windows v2.12.0 (February 25th 2017)

A MinGit-only v2.12.0(2) was released in the meantime.

New Features

  * Comes with Git v2.12.1.
  * In addition to the GitForWindows NuGet package, we now also publish
    MinGit as a NuGet package.
  * Git for Windows now bundles Git LFS.
  * Comes with Git Credential Manager v1.9.0.
  * Git can now be configured to use Secure Channel to use the Windows
    Credential Store when fetching/pushing via HTTPS.
  * Updates Git-Flow to v1.10.2 (addressing #1092).
  * Git for Windows' fork of the MSYS2 runtime was rebased to a preview
    of the Cygwin runtime version 2.8.0 (due soon) to fix fork: child
    <n> - forked process <pid> died unexpectedly, retry 0, exit code
    0xC0000142, errno 11 problems.

Bug Fixes

  * MinGit no longer gets distracted by incompatible libeay32.dll
    versions in C:\Windows\system32.
  * Long paths between 248 and 260 characters were not handled
    correctly since Git for Windows v2.11.1, which is now fixed.
  * The awk.exe shipped with MinGit now ships with a previously missing
    a dependency (this fixes git mergetool).
  * Git for Windows does not ship with localized messages to save on
    bandwidth, and the gettext initialization can be skipped when the
    directory with said messages is missing, saving us up to 150ms on
    every git.exe startup.
  * A possible crash when running git log --pickaxe-regex -S<regex> was
    fixed.
  * The ORIGINAL_PATH variable, recently introduced by the MSYS2
    project to allow for special "PATH modes", is now handled in the
    same manner as the PATH variable when jumping the Windows<->MSYS2
    boundary, fixing issues when ORIGINAL_PATH is converted to Windows
    format and back again.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@dscho dscho

Labels
None yet
Projects
None yet
Milestone
v2.12.1
Development

No branches or pull requests
3 participants
@dscho @shiftkey @vielhuber