rugged 1.9.0 → 1.9.4

data/vendor/libgit2/src/libgit2/index.c

@@ -1225,7 +1225,7 @@ static int canonicalize_directory_path(
 {
 	const git_index_entry *match, *best = NULL;
 	char *search, *sep;
-	size_t pos, search_len, best_len;
+	size_t pos, search_len, best_len = 0;
 
 	if (!index->ignore_case)
 		return 0;
@@ -1448,7 +1448,7 @@ out:
 	return error;
 }
 
-static int index_conflict_to_reuc(git_index *index, const char *path)
+int git_index__conflict_to_reuc(git_index *index, const char *path)
 {
 	const git_index_entry *conflict_entries[3];
 	int ancestor_mode, our_mode, their_mode;
@@ -1528,7 +1528,7 @@ int git_index_add_from_buffer(
 		return error;
 
 	/* Adding implies conflict was resolved, move conflict entries to REUC */
-	if ((error = index_conflict_to_reuc(index, entry->path)) < 0 && error != GIT_ENOTFOUND)
+	if ((error = git_index__conflict_to_reuc(index, entry->path)) < 0 && error != GIT_ENOTFOUND)
 		return error;
 
 	git_tree_cache_invalidate_path(index->tree, entry->path);
@@ -1624,7 +1624,7 @@ int git_index_add_bypath(git_index *index, const char *path)
 	}
 
 	/* Adding implies conflict was resolved, move conflict entries to REUC */
-	if ((ret = index_conflict_to_reuc(index, path)) < 0 && ret != GIT_ENOTFOUND)
+	if ((ret = git_index__conflict_to_reuc(index, path)) < 0 && ret != GIT_ENOTFOUND)
 		return ret;
 
 	git_tree_cache_invalidate_path(index->tree, entry->path);
@@ -1640,7 +1640,7 @@ int git_index_remove_bypath(git_index *index, const char *path)
 
 	if (((ret = git_index_remove(index, path, 0)) < 0 &&
 		ret != GIT_ENOTFOUND) ||
-		((ret = index_conflict_to_reuc(index, path)) < 0 &&
+		((ret = git_index__conflict_to_reuc(index, path)) < 0 &&
 		ret != GIT_ENOTFOUND))
 		return ret;
 
@@ -2525,7 +2525,7 @@ static int read_entry(
 {
 	size_t path_length, path_offset, entry_size;
 	const char *path_ptr;
-	struct entry_common *source_common;
+	struct entry_common *source_common = NULL;
 	index_entry_short_sha1 source_sha1;
 #ifdef GIT_EXPERIMENTAL_SHA256
 	index_entry_short_sha256 source_sha256;
@@ -2877,7 +2877,7 @@ static int write_disk_entry(
 	const char *last)
 {
 	void *mem = NULL;
-	struct entry_common *ondisk_common;
+	struct entry_common *ondisk_common = NULL;
 	size_t path_len, path_offset, disk_size;
 	int varint_len = 0;
 	char *path;
@@ -2966,7 +2966,7 @@ static int write_disk_entry(
 	path_offset = index_entry_path_offset(index->oid_type, entry->flags);
 
 	if (entry->flags & GIT_INDEX_ENTRY_EXTENDED) {
-		struct entry_common *ondisk_ext;
+		struct entry_common *ondisk_ext = NULL;
 		uint16_t flags_extended = htons(entry->flags_extended &
 			GIT_INDEX_ENTRY_EXTENDED_FLAGS);
 

data/vendor/libgit2/src/libgit2/index.h

@@ -154,6 +154,9 @@ extern int git_index__open(
 	const char *index_path,
 	git_oid_t oid_type);
 
+/* If the path is conflicted, move it from the index to reuc. */
+int git_index__conflict_to_reuc(git_index *index, const char *path);
+
 /* Copy the current entries vector *and* increment the index refcount.
  * Call `git_index__release_snapshot` when done.
  */

data/vendor/libgit2/src/libgit2/indexer.c

@@ -921,12 +921,12 @@ int git_indexer_append(git_indexer *idx, const void *data, size_t size, git_inde
 		if (git_vector_init(&idx->deltas, total_objects / 2, NULL) < 0)
 			return -1;
 
+		stats->total_objects = total_objects;
+		stats->indexed_objects = 0;
 		stats->received_objects = 0;
 		stats->local_objects = 0;
 		stats->total_deltas = 0;
 		stats->indexed_deltas = 0;
-		stats->indexed_objects = 0;
-		stats->total_objects = total_objects;
 
 		if ((error = do_progress_callback(idx, stats)) != 0)
 			return error;

data/vendor/libgit2/src/libgit2/merge.c

@@ -936,7 +936,7 @@ static int merge_conflict_resolve_contents(
 	git_merge_file_result result = {0};
 	git_merge_driver *driver;
 	git_merge_driver__builtin builtin = {{0}};
-	git_index_entry *merge_result;
+	git_index_entry *merge_result = NULL;
 	git_odb *odb = NULL;
 	const char *name;
 	bool fallback = false;

data/vendor/libgit2/src/libgit2/merge.h

@@ -165,6 +165,10 @@ GIT_INLINE(const char *) git_merge_file__best_path(
 	if (!ancestor) {
 		if (ours && theirs && strcmp(ours, theirs) == 0)
 			return ours;
+		if (ours && !theirs)
+			return ours;
+		if (theirs && !ours)
+			return theirs;
 
 		return NULL;
 	}

data/vendor/libgit2/src/libgit2/merge_file.c

@@ -84,30 +84,34 @@ static int merge_file__xdiff(
 
 	memset(&xmparam, 0x0, sizeof(xmparam_t));
 
-	if (ours->size > LONG_MAX ||
-	    theirs->size > LONG_MAX ||
+	if ((ours && ours->size > LONG_MAX) ||
+	    (theirs && theirs->size > LONG_MAX) ||
 	    (ancestor && ancestor->size > LONG_MAX)) {
 		git_error_set(GIT_ERROR_MERGE, "failed to merge files");
 		error = -1;
 		goto done;
 	}
 
-	if (ancestor) {
+	if (ancestor && ancestor->size) {
 		xmparam.ancestor = (options.ancestor_label) ?
 			options.ancestor_label : ancestor->path;
 		ancestor_mmfile.ptr = (char *)ancestor->ptr;
 		ancestor_mmfile.size = (long)ancestor->size;
 	}
 
-	xmparam.file1 = (options.our_label) ?
-		options.our_label : ours->path;
-	our_mmfile.ptr = (char *)ours->ptr;
-	our_mmfile.size = (long)ours->size;
+	if (ours && ours->size) {
+		xmparam.file1 = (options.our_label) ?
+			options.our_label : ours->path;
+		our_mmfile.ptr = (char *)ours->ptr;
+		our_mmfile.size = (long)ours->size;
+	}
 
-	xmparam.file2 = (options.their_label) ?
-		options.their_label : theirs->path;
-	their_mmfile.ptr = (char *)theirs->ptr;
-	their_mmfile.size = (long)theirs->size;
+	if (theirs && theirs->size) {
+		xmparam.file2 = (options.their_label) ?
+			options.their_label : theirs->path;
+		their_mmfile.ptr = (char *)theirs->ptr;
+		their_mmfile.size = (long)theirs->size;
+	}
 
 	if (options.favor == GIT_MERGE_FILE_FAVOR_OURS)
 		xmparam.favor = XDL_MERGE_FAVOR_OURS;
@@ -148,8 +152,8 @@ static int merge_file__xdiff(
 
 	path = git_merge_file__best_path(
 		ancestor ? ancestor->path : NULL,
-		ours->path,
-		theirs->path);
+		ours ? ours->path : NULL,
+		theirs ? theirs->path : NULL);
 
 	if (path != NULL && (out->path = git__strdup(path)) == NULL) {
 		error = -1;
@@ -161,8 +165,8 @@ static int merge_file__xdiff(
 	out->len = mmbuffer.size;
 	out->mode = git_merge_file__best_mode(
 		ancestor ? ancestor->mode : 0,
-		ours->mode,
-		theirs->mode);
+		ours ? ours->mode : 0,
+		theirs ? theirs->mode : 0);
 
 done:
 	if (error < 0)
@@ -201,7 +205,7 @@ static int merge_file__binary(
 		goto done;
 
 	if ((out->path = git__strdup(favored->path)) == NULL ||
-		(out->ptr = git__malloc(favored->size)) == NULL)
+	    (out->ptr = git__malloc(favored->size)) == NULL)
 		goto done;
 
 	memcpy((char *)out->ptr, favored->ptr, favored->size);
@@ -221,8 +225,8 @@ static int merge_file__from_inputs(
 	const git_merge_file_options *given_opts)
 {
 	if (merge_file__is_binary(ancestor) ||
-		merge_file__is_binary(ours) ||
-		merge_file__is_binary(theirs))
+	    merge_file__is_binary(ours) ||
+	    merge_file__is_binary(theirs))
 		return merge_file__binary(out, ours, theirs, given_opts);
 
 	return merge_file__xdiff(out, ancestor, ours, theirs, given_opts);
@@ -261,8 +265,11 @@ int git_merge_file(
 	if (ancestor)
 		ancestor = git_merge_file__normalize_inputs(&inputs[0], ancestor);
 
-	ours = git_merge_file__normalize_inputs(&inputs[1], ours);
-	theirs = git_merge_file__normalize_inputs(&inputs[2], theirs);
+	if (ours)
+		ours = git_merge_file__normalize_inputs(&inputs[1], ours);
+
+	if (theirs)
+		theirs = git_merge_file__normalize_inputs(&inputs[2], theirs);
 
 	return merge_file__from_inputs(out, ancestor, ours, theirs, options);
 }
@@ -275,16 +282,16 @@ int git_merge_file_from_index(
 	const git_index_entry *theirs,
 	const git_merge_file_options *options)
 {
-	git_merge_file_input *ancestor_ptr = NULL,
-		ancestor_input = {0}, our_input = {0}, their_input = {0};
-	git_odb *odb = NULL;
+	git_merge_file_input ancestor_input = {0};
+	git_merge_file_input our_input = {0};
+	git_merge_file_input their_input = {0};
+	git_odb *odb;
 	git_odb_object *odb_object[3] = { 0 };
 	int error = 0;
 
 	GIT_ASSERT_ARG(out);
 	GIT_ASSERT_ARG(repo);
-	GIT_ASSERT_ARG(ours);
-	GIT_ASSERT_ARG(theirs);
+	GIT_ASSERT_ARG(ancestor || ours || theirs);
 
 	memset(out, 0x0, sizeof(git_merge_file_result));
 
@@ -295,16 +302,22 @@ int git_merge_file_from_index(
 		if ((error = merge_file_input_from_index(
 			&ancestor_input, &odb_object[0], odb, ancestor)) < 0)
 			goto done;
+	}
 
-		ancestor_ptr = &ancestor_input;
+	if (ours) {
+		if ((error = merge_file_input_from_index(
+			&our_input, &odb_object[1], odb, ours)) < 0)
+			goto done;
 	}
 
-	if ((error = merge_file_input_from_index(&our_input, &odb_object[1], odb, ours)) < 0 ||
-	    (error = merge_file_input_from_index(&their_input, &odb_object[2], odb, theirs)) < 0)
-		goto done;
+	if (theirs) {
+		if ((error = merge_file_input_from_index(
+			&their_input, &odb_object[2], odb, theirs)) < 0)
+			goto done;
+	}
 
 	error = merge_file__from_inputs(out,
-		ancestor_ptr, &our_input, &their_input, options);
+		&ancestor_input, &our_input, &their_input, options);
 
 done:
 	git_odb_object_free(odb_object[0]);

data/vendor/libgit2/src/libgit2/message.c

@@ -33,7 +33,7 @@ static int git_message__prettify(
 
 	int consecutive_empty_lines = 0;
 	size_t i, line_length, rtrimmed_line_length;
-	char *next_newline;
+	const char *next_newline;
 
 	for (i = 0; i < strlen(message); i += line_length) {
 		next_newline = memchr(message + i, '\n', message_len - i);

data/vendor/libgit2/src/libgit2/midx.c

@@ -460,7 +460,7 @@ int git_midx_foreach_entry(
 {
 	git_oid oid;
 	size_t oid_size, i;
-	int error;
+	int error = 0;
 
 	GIT_ASSERT_ARG(idx);
 
@@ -579,8 +579,7 @@ int git_midx_writer_add(
 	if (error < 0)
 		return error;
 
-	/* TODO: SHA256 */
-	error = git_mwindow_get_pack(&p, git_str_cstr(&idx_path_buf), 0);
+	error = git_mwindow_get_pack(&p, git_str_cstr(&idx_path_buf), w->oid_type);
 	git_str_dispose(&idx_path_buf);
 	if (error < 0)
 		return error;

data/vendor/libgit2/src/libgit2/odb.c

@@ -790,12 +790,8 @@ static int load_alternates(git_odb *odb, const char *objects_dir, int alternate_
 		if (*alternate == '\0' || *alternate == '#')
 			continue;
 
-		/*
-		 * Relative path: build based on the current `objects`
-		 * folder. However, relative paths are only allowed in
-		 * the current repository.
-		 */
-		if (*alternate == '.' && !alternate_depth) {
+		/* Relative path: build based on the current `objects` folder. */
+		if (*alternate == '.') {
 			if ((result = git_str_joinpath(&alternates_path, objects_dir, alternate)) < 0)
 				break;
 			alternate = git_str_cstr(&alternates_path);

data/vendor/libgit2/src/libgit2/odb_loose.c

@@ -276,8 +276,8 @@ done:
 static int read_loose_standard(git_rawobj *out, git_str *obj)
 {
 	git_zstream zstream = GIT_ZSTREAM_INIT;
-	unsigned char head[MAX_HEADER_LEN], *body = NULL;
-	size_t decompressed, head_len, body_len, alloc_size;
+	unsigned char head[MAX_HEADER_LEN], *body = NULL, *body_out;
+	size_t decompressed, head_len, body_remain, alloc_size;
 	obj_hdr hdr;
 	int error;
 
@@ -285,16 +285,16 @@ static int read_loose_standard(git_rawobj *out, git_str *obj)
 		(error = git_zstream_set_input(&zstream, git_str_cstr(obj), git_str_len(obj))) < 0)
 		goto done;
 
-	decompressed = sizeof(head);
-
 	/*
 	 * inflate the initial part of the compressed buffer in order to
-	 * parse the header; read the largest header possible, then push the
-	 * remainder into the body buffer.
+	 * parse the header and read the largest header possible. later, we'll
+	 * push the remainder into the body buffer.
 	 */
+	decompressed = sizeof(head);
 	if ((error = git_zstream_get_output(head, &decompressed, &zstream)) < 0 ||
 		(error = parse_header(&hdr, &head_len, head, decompressed)) < 0)
 		goto done;
+	GIT_ASSERT(head_len <= decompressed);
 
 	if (!git_object_typeisloose(hdr.type)) {
 		git_error_set(GIT_ERROR_ODB, "failed to inflate disk object");
@@ -311,16 +311,24 @@ static int read_loose_standard(git_rawobj *out, git_str *obj)
 		error = -1;
 		goto done;
 	}
+	body_out = body;
+	body_remain = hdr.size;
 
-	GIT_ASSERT(decompressed >= head_len);
-	body_len = decompressed - head_len;
-
-	if (body_len)
-		memcpy(body, head + head_len, body_len);
+	decompressed -= head_len;
+	if (decompressed > body_remain) {
+		git_error_set(GIT_ERROR_ODB, "malformed object: body was longer than specified in header");
+		error = -1;
+		goto done;
+	}
+	if (decompressed)
+		memcpy(body_out, head + head_len, decompressed);
+	body_out += decompressed;
+	body_remain -= decompressed;
 
-	decompressed = hdr.size - body_len;
-	if ((error = git_zstream_get_output(body + body_len, &decompressed, &zstream)) < 0)
+	decompressed = body_remain;
+	if ((error = git_zstream_get_output(body_out, &decompressed, &zstream)) < 0)
 		goto done;
+	body_out += decompressed;
 
 	if (!git_zstream_done(&zstream)) {
 		git_error_set(GIT_ERROR_ZLIB, "failed to finish zlib inflation: stream aborted prematurely");
@@ -328,7 +336,9 @@ static int read_loose_standard(git_rawobj *out, git_str *obj)
 		goto done;
 	}
 
-	body[hdr.size] = '\0';
+	/* object bodies that are too short are silently zero-padded */
+	GIT_ASSERT(body_out <= body + hdr.size);
+	*body_out = '\0';
 
 	out->data = body;
 	out->len = hdr.size;

data/vendor/libgit2/src/libgit2/oid.c

@@ -22,6 +22,8 @@ const git_oid git_oid__empty_tree_sha1 =
 	  { 0x4b, 0x82, 0x5d, 0xc6, 0x42, 0xcb, 0x6e, 0xb9, 0xa0, 0x60,
 	    0xe5, 0x4b, 0xf8, 0xd6, 0x92, 0x88, 0xfb, 0xee, 0x49, 0x04 });
 
+static const unsigned char git_oid_zero[GIT_OID_MAX_SIZE] = {0};
+
 static int oid_error_invalid(const char *msg)
 {
 	git_error_set(GIT_ERROR_INVALID, "unable to parse OID - %s", msg);
@@ -318,7 +320,7 @@ int git_oid_streq(const git_oid *oid_a, const char *str)
 int git_oid_is_zero(const git_oid *oid_a)
 {
 	const unsigned char *a = oid_a->id;
-	size_t size = git_oid_size(git_oid_type(oid_a)), i;
+	size_t size = git_oid_size(git_oid_type(oid_a));
 
 #ifdef GIT_EXPERIMENTAL_SHA256
 	if (!oid_a->type)
@@ -327,10 +329,7 @@ int git_oid_is_zero(const git_oid *oid_a)
 		return 0;
 #endif
 
-	for (i = 0; i < size; ++i, ++a)
-		if (*a != 0)
-			return 0;
-	return 1;
+	return git_oid_raw_cmp(a, git_oid_zero, size) == 0 ? 1 : 0;
 }
 
 #ifndef GIT_DEPRECATE_HARD

data/vendor/libgit2/src/libgit2/pack-objects.c

@@ -1420,7 +1420,7 @@ int git_packbuilder_write(
 	git_str object_path = GIT_STR_INIT;
 	git_indexer_options opts = GIT_INDEXER_OPTIONS_INIT;
 	git_indexer *indexer = NULL;
-	git_indexer_progress stats;
+	git_indexer_progress stats = { 0 };
 	struct pack_write_context ctx;
 	int t;
 
@@ -1437,12 +1437,10 @@ int git_packbuilder_write(
 	opts.progress_cb = progress_cb;
 	opts.progress_cb_payload = progress_cb_payload;
 
-	/* TODO: SHA256 */
-
 #ifdef GIT_EXPERIMENTAL_SHA256
 	opts.mode = mode;
 	opts.odb = pb->odb;
-	opts.oid_type = GIT_OID_SHA1;
+	opts.oid_type = pb->oid_type;
 
 	error = git_indexer_new(&indexer, path, &opts);
 #else

data/vendor/libgit2/src/libgit2/pack.c

@@ -941,6 +941,9 @@ static int packfile_unpack_compressed(
 		goto out;
 	}
 
+	/* zlib may have garbled the trailing buffer */
+	data[size] = '\0';
+
 	obj->type = type;
 	obj->len = size;
 	obj->data = data;

data/vendor/libgit2/src/libgit2/refs.c

@@ -819,7 +819,7 @@ int git_reference_list(
 
 static int is_valid_ref_char(char ch)
 {
-	if ((unsigned) ch <= ' ')
+	if ((unsigned) ch <= ' ' || ch == '\177') /* ASCII control characters */
 		return 0;
 
 	switch (ch) {
@@ -894,6 +894,9 @@ static bool is_valid_normalized_name(const char *name, size_t len)
 		if (i == 0 && c == '^')
 			continue; /* The first character is allowed to be "^" for negative refspecs */
 
+		if (len == 1 && c == '@')
+			return true; /* Abbreviation for HEAD */
+
 		if ((c < 'A' || c > 'Z') && c != '_')
 			return false;
 	}
@@ -965,11 +968,16 @@ int git_reference__normalize_name(
 				process_flags &= ~GIT_REFERENCE_FORMAT_REFSPEC_PATTERN;
 
 			if (normalize) {
-				size_t cur_len = git_str_len(buf);
-
-				git_str_joinpath(buf, git_str_cstr(buf), current);
-				git_str_truncate(buf,
-					cur_len + segment_len + (segments_count ? 1 : 0));
+				/* `<empty>@` (i.e. just `@`) is an alias for `HEAD` */
+				if (segments_count == 0 && segment_len == 1 && current[0] == '@') {
+					git_str_sets(buf, GIT_HEAD_FILE);
+				} else {
+					size_t cur_len = git_str_len(buf);
+
+					git_str_joinpath(buf, git_str_cstr(buf), current);
+					git_str_truncate(buf,
+						cur_len + segment_len + (segments_count ? 1 : 0));
+				}
 
 				if (git_str_oom(buf)) {
 					error = -1;
@@ -1018,6 +1026,7 @@ int git_reference__normalize_name(
 			goto cleanup;
 
 	if ((segments_count > 1)
+		&& !(flags & GIT_REFERENCE_FORMAT_REFSPEC_SHORTHAND)
 		&& (is_valid_normalized_name(name, strchr(name, '/') - name)))
 			goto cleanup;
 

data/vendor/libgit2/src/libgit2/remote.c

@@ -236,6 +236,9 @@ int git_remote_create_with_opts(git_remote **out, const char *url, const git_rem
 	if (opts->repository) {
 		if ((error = git_repository_config_snapshot(&config_ro, opts->repository)) < 0)
 			goto on_error;
+	} else if (!(opts->flags & GIT_REMOTE_CREATE_SKIP_INSTEADOF)) {
+		if ((error = git_config_open_default(&config_ro)) < 0)
+			goto on_error;
 	}
 
 	remote = git__calloc(1, sizeof(git_remote));
@@ -247,7 +250,7 @@ int git_remote_create_with_opts(git_remote **out, const char *url, const git_rem
 		(error = canonicalize_url(&canonical_url, url)) < 0)
 		goto on_error;
 
-	if (opts->repository && !(opts->flags & GIT_REMOTE_CREATE_SKIP_INSTEADOF)) {
+	if (config_ro && !(opts->flags & GIT_REMOTE_CREATE_SKIP_INSTEADOF)) {
 		if ((error = apply_insteadof(&remote->url, config_ro, canonical_url.ptr, GIT_DIRECTION_FETCH, true)) < 0 ||
 		    (error = apply_insteadof(&remote->pushurl, config_ro, canonical_url.ptr, GIT_DIRECTION_PUSH, false)) < 0)
 			goto on_error;

data/vendor/libgit2/src/libgit2/remote.h

@@ -58,7 +58,6 @@ int git_remote_connect_options_normalize(
 	const git_remote_connect_options *src);
 
 int git_remote_capabilities(unsigned int *out, git_remote *remote);
-int git_remote_oid_type(git_oid_t *out, git_remote *remote);
 
 
 #define git_remote_connect_options__copy_opts(out, in) \

data/vendor/libgit2/src/libgit2/repository.c

@@ -562,7 +562,7 @@ static int validate_ownership_cb(const git_config_entry *entry, void *payload)
 	validate_ownership_data *data = payload;
 	const char *test_path;
 
-	if (strcmp(entry->value, "") == 0) {
+	if (!entry->value || strcmp(entry->value, "") == 0) {
 		*data->is_safe = false;
 	} else if (strcmp(entry->value, "*") == 0) {
 		*data->is_safe = true;
@@ -667,7 +667,7 @@ static int validate_ownership_path(bool *is_safe, const char *path)
 
 static int validate_ownership(git_repository *repo)
 {
-	const char *validation_paths[3] = { NULL }, *path;
+	const char *validation_paths[3] = { NULL }, *path = NULL;
 	size_t validation_len = 0, i;
 	bool is_safe = false;
 	int error = 0;
@@ -1410,7 +1410,7 @@ int git_repository_config__weakptr(git_config **out, git_repository *repo)
 		git_str xdg_buf = GIT_STR_INIT;
 		git_str programdata_buf = GIT_STR_INIT;
 		bool use_env = repo->use_env;
-		git_config *config;
+		git_config *config = NULL;
 
 		if (!(error = config_path_system(&system_buf, use_env)) &&
 		    !(error = config_path_global(&global_buf, use_env))) {
@@ -1865,7 +1865,8 @@ static const char *builtin_extensions[] = {
 	"noop",
 	"objectformat",
 	"worktreeconfig",
-	"preciousobjects"
+	"preciousobjects",
+	"relativeworktrees"
 };
 
 static git_vector user_extensions = { 0, git__strcmp_cb };

data/vendor/libgit2/src/libgit2/streams/socket.c

@@ -20,6 +20,10 @@
 # include <netdb.h>
 # include <netinet/in.h>
 # include <arpa/inet.h>
+# include <netinet/tcp.h>
+# ifdef __APPLE__
+#  include <sys/socket.h>
+# endif
 #else
 # include <winsock2.h>
 # include <ws2tcpip.h>
@@ -188,6 +192,32 @@ static int socket_connect(git_stream *stream)
 	for (p = info; p != NULL; p = p->ai_next) {
 		s = socket(p->ai_family, p->ai_socktype | SOCK_CLOEXEC, p->ai_protocol);
 
+		/* Enable TCP keepalive to detect dead connections */
+		if (s != INVALID_SOCKET && p->ai_family == AF_INET) {
+			int keepalive = 1;
+			if (setsockopt(s, SOL_SOCKET, SO_KEEPALIVE,
+			               (const char *)&keepalive, sizeof(keepalive)) == 0) {
+#ifdef __APPLE__
+				/* macOS: Set idle time to 60 seconds */
+				int keepidle = 60;
+				setsockopt(s, IPPROTO_TCP, TCP_KEEPALIVE,
+				          &keepidle, sizeof(keepidle));
+				/* Note: TCP_CONNECTIONTIMEOUT (0x20) could also be set */
+#elif defined(__linux__)
+				/* Linux: Set idle, interval, and count */
+				int keepidle = 60;   /* Start probes after 60 seconds */
+				int keepintvl = 10;  /* 10 seconds between probes */
+				int keepcnt = 3;     /* 3 probes before giving up */
+				setsockopt(s, IPPROTO_TCP, TCP_KEEPIDLE,
+				          &keepidle, sizeof(keepidle));
+				setsockopt(s, IPPROTO_TCP, TCP_KEEPINTVL,
+				          &keepintvl, sizeof(keepintvl));
+				setsockopt(s, IPPROTO_TCP, TCP_KEEPCNT,
+				          &keepcnt, sizeof(keepcnt));
+#endif
+			}
+		}
+
 		if (s == INVALID_SOCKET)
 			continue;
 

data/vendor/libgit2/src/libgit2/submodule.c

@@ -1075,16 +1075,23 @@ int git_submodule_add_to_index(git_submodule *sm, int write_index)
 	git_commit_free(head);
 
 	/* add it */
-	error = git_index_add(index, &entry);
+	if ((error = git_index_add(index, &entry)) < 0)
+		goto cleanup;
+
+	/* Adding implies conflict was resolved, move conflict entries to REUC */
+	if ((error = git_index__conflict_to_reuc(index, entry.path)) < 0 && error != GIT_ENOTFOUND)
+		goto cleanup;
 
 	/* write it, if requested */
-	if (!error && write_index) {
-		error = git_index_write(index);
+	if (write_index) {
+		if ((error = git_index_write(index)) < 0)
+			goto cleanup;
 
-		if (!error)
-			git_oid_cpy(&sm->index_oid, &sm->wd_oid);
+		git_oid_cpy(&sm->index_oid, &sm->wd_oid);
 	}
 
+	error = 0;
+
 cleanup:
 	git_repository_free(sm_repo);
 	git_str_dispose(&path);

data/vendor/libgit2/src/libgit2/tag.c

@@ -263,8 +263,10 @@ static bool tag_name_is_valid(const char *tag_name)
 	/*
 	 * Discourage tag name starting with dash,
 	 * https://github.com/git/git/commit/4f0accd638b8d2
+	 * and refuse to use HEAD as a tagname,
+	 * https://github.com/git/git/commit/bbd445d5efd415
 	 */
-	return tag_name[0] != '-';
+	return tag_name[0] != '-' && git__strcmp(tag_name, "HEAD");
 }
 
 static int git_tag_create__internal(

data/vendor/libgit2/src/libgit2/transports/auth_sspi.c

@@ -324,12 +324,14 @@ static int sspi_init_context(
 	return 0;
 }
 
+#if defined(GIT_GSSAPI) || defined(GIT_GSSFRAMEWORK) || defined(GIT_WIN32)
 int git_http_auth_negotiate(
 	git_http_auth_context **out,
 	const git_net_url *url)
 {
 	return sspi_init_context(out, GIT_HTTP_AUTH_NEGOTIATE, url);
 }
+#endif
 
 int git_http_auth_ntlm(
 	git_http_auth_context **out,