git: Update to 2.42.0 (v2)
this time without missing includes, so things don't crash
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user