From 6611d8aebae99b845b7fa0575b4bbb3e78b3757a Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 29 Sep 2015 10:41:45 +0200
Subject: [PATCH] Switch git-flow to use the AVH edition

The https://github.com/nvie/git-flow repository appears to be
abandoned. The common wisdom is that Peter van der Does' AVH edition
is the legitimate successor:

	https://github.com/petervanderdoes/gitflow-avh

This fixes issue https://github.com/git-for-windows/git/issues/416

Original-patch-by: Robert Dailey <rcdailey@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 git-flow/PKGBUILD | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/git-flow/PKGBUILD b/git-flow/PKGBUILD
index ef721c95..29c78cd0 100644
--- a/git-flow/PKGBUILD
+++ b/git-flow/PKGBUILD
@@ -2,14 +2,14 @@
 
 _realname=git-flow
 pkgname=("${_realname}")
-pkgver=0.4.1.108.g15aab26
+pkgver=1.8.0.58.gd441201
 pkgrel=1
-pkgdesc="Git extensions to provide high-level repository operations for Vincent Driessen's branching model"
+pkgdesc="Git extensions to provide high-level repository operations for Vincent Driessen's branching model (AVH edition)"
 arch=('i686' 'x86_64')
 license=('BSD')
 depends=('git' 'util-linux')
-url="http://nvie.com/posts/a-successful-git-branching-model/"
-source=("${_realname}"::"git+https://github.com/nvie/gitflow.git#branch=develop")
+url="https://github.com/petervanderdoes/gitflow-avh"
+source=("${_realname}"::"git+https://github.com/petervanderdoes/gitflow-avh.git#branch=develop")
 sha1sums=('SKIP')
 
 pkgver() {
@@ -26,18 +26,6 @@ pkgver() {
   sed -e 's/^v//' -e 'y/-/./'
 }
 
-prepare () {
-  cd "${srcdir}/${_realname}"
-
-  git submodule update --init
-
-  # Make sure that gitflow-shFlags is handled properly
-  test true = "$(git config core.symlinks)" || {
-    git config core.symlinks true
-    git reset --hard
-  }
-}
-
 package() {
   cd "${srcdir}/${_realname}"