From 8d5ce1c3bb24d288a5ae1d4bace59c4d40d1af7c Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Thu, 24 Aug 2023 07:31:34 +0200
Subject: [PATCH] git: Update to 2.42.0 (v2)

this time without missing includes, so things don't crash
---
 git/PKGBUILD                               |  8 +++---
 git/git-2.8.2-Cygwin-Allow-DOS-paths.patch | 32 ++++++++++++++++------
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/git/PKGBUILD b/git/PKGBUILD
index 887d25bd..fdb91d57 100644
--- a/git/PKGBUILD
+++ b/git/PKGBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Ray Donnelly <mingw.android@gmail.com>
 
 pkgname=git
-pkgver=2.41.0
-pkgrel=1
+pkgver=2.42.0
+pkgrel=2
 pkgdesc="The fast distributed version control system"
 arch=('i686' 'x86_64')
 url="https://git-scm.com/"
@@ -55,11 +55,11 @@ source=("${pkgname}-${pkgver}.tar.gz"::https://github.com/git/git/archive/v${pkg
         git-2.8.2-Cygwin-Allow-DOS-paths.patch
         git-tcsh-completion-fixes.patch
         git-2.35.1-git-gui.patch)
-sha256sums=('4f0b74bbde2800b00d3a50a7f389bcf1d59f1265b6986c00048d8ba4892ab01a'
+sha256sums=('60c06eb7ce840903169ed4872224b2409dd8d8a518e9df847c6dc0ef10d35d99'
             '32baa705d76789d82316a1325e61c9a261114eaa9814dca9c05683bf63069dea'
             '9bc4da5022c5004c4c5b45417b25c6636ddf0ac338574a624c2c775d4394546d'
             '336159815092f503e0254ebbbea2b637ffc09a36217c4c644167b86852568272'
-            '425d5b05b0daca7298f38702c37153f31eb35afd30ac1dff19d2b53492058614'
+            '148a2c45de2c8bb2dfffc96bd40523f860a4b13f4e661609636158b7b3bc930b'
             '6f25aae9e92469d5e284dcf372e15ee0e57ff91531e691e7391f9bfb78f73626'
             '080533696ee3105f3f311a1dc6d8ebe7bf386262cc265d34ef7e9cc4353a736d')
 
diff --git a/git/git-2.8.2-Cygwin-Allow-DOS-paths.patch b/git/git-2.8.2-Cygwin-Allow-DOS-paths.patch
index 3c6f1538..2e217fd0 100644
--- a/git/git-2.8.2-Cygwin-Allow-DOS-paths.patch
+++ b/git/git-2.8.2-Cygwin-Allow-DOS-paths.patch
@@ -72,9 +72,17 @@
  int daemon_avoid_alias(const char *p)
  {
  	int sl, ndot;
---- a/pathspec.c
-+++ b/pathspec.c
-@@ -418,6 +418,10 @@ static void init_pathspec_item(struct pathspec_item *item, unsigned flags,
+--- git-2.42.0/pathspec.c.orig	2023-08-21 18:34:58.000000000 +0200
++++ git-2.42.0/pathspec.c	2023-08-24 07:39:08.876950400 +0200
+@@ -13,6 +13,7 @@
+ #include "symlinks.h"
+ #include "quote.h"
+ #include "wildmatch.h"
++#include "path.h"
+ 
+ /*
+  * Finds which of the given pathspecs match items in the index.
+@@ -426,6 +427,10 @@
  			       const char *prefix, int prefixlen,
  			       const char *elt)
  {
@@ -85,7 +93,7 @@
  	unsigned magic = 0, element_magic = 0;
  	const char *copyfrom = elt;
  	char *match;
-@@ -514,6 +518,10 @@ static void init_pathspec_item(struct pathspec_item *item, unsigned flags,
+@@ -522,6 +527,10 @@
  	    item->prefix         > item->len) {
  		BUG("error initializing pathspec_item");
  	}
@@ -96,9 +104,17 @@
  }
  
  static int pathspec_item_cmp(const void *a_, const void *b_)
---- a/strbuf.c
-+++ b/strbuf.c
-@@ -894,6 +894,10 @@ void strbuf_humanise_rate(struct strbuf *buf, off_t bytes)
+--- git-2.42.0/abspath.c.orig	2023-08-21 18:34:58.000000000 +0200
++++ git-2.42.0/abspath.c	2023-08-24 07:32:02.255887900 +0200
+@@ -1,6 +1,7 @@
+ #include "git-compat-util.h"
+ #include "abspath.h"
+ #include "strbuf.h"
++#include "path.h"
+ 
+ /*
+  * Do not use this for inspecting *tracked* content.  When path is a
+@@ -292,6 +293,10 @@
  
  void strbuf_add_absolute_path(struct strbuf *sb, const char *path)
  {
@@ -109,7 +125,7 @@
  	if (!*path)
  		die("The empty string is not a valid path");
  	if (!is_absolute_path(path)) {
-@@ -915,6 +919,10 @@ void strbuf_add_absolute_path(struct strbuf *sb, const char *path)
+@@ -313,6 +318,10 @@
  		free(cwd);
  	}
  	strbuf_addstr(sb, path);