rugged 0.27.10 → 0.27.10.1

data/vendor/libgit2/src/submodule.h

@@ -11,7 +11,7 @@
 
 #include "git2/submodule.h"
 #include "git2/repository.h"
-#include "futils.h"
+#include "fileops.h"
 
 /* Notes:
  *

data/vendor/libgit2/src/sysdir.c

@@ -57,12 +57,12 @@ static int get_passwd_home(git_buf *out, uid_t uid)
 	} while (error == ERANGE && buflen <= 8192);
 
 	if (error) {
-		git_error_set(GIT_ERROR_OS, "failed to get passwd entry");
+		giterr_set(GITERR_OS, "failed to get passwd entry");
 		goto out;
 	}
 
 	if (!pwdptr) {
-		git_error_set(GIT_ERROR_OS, "no passwd entry found for user");
+		giterr_set(GITERR_OS, "no passwd entry found for user");
 		goto out;
 	}
 
@@ -82,31 +82,21 @@ static int git_sysdir_guess_global_dirs(git_buf *out)
 #else
 	int error;
 	uid_t uid, euid;
-	const char *sandbox_id;
 
 	uid = getuid();
 	euid = geteuid();
 
-	/**
-	 * If APP_SANDBOX_CONTAINER_ID is set, we are running in a
-	 * sandboxed environment on macOS.
-	 */
-	sandbox_id = getenv("APP_SANDBOX_CONTAINER_ID");
-
 	/*
 	 * In case we are running setuid, use the configuration
 	 * of the effective user.
-	 *
-	 * If we are running in a sandboxed environment on macOS,
-	 * we have to get the HOME dir from the password entry file.
 	 */
-	if (!sandbox_id && uid == euid)
+	if (uid == euid)
 	    error = git__getenv(out, "HOME");
 	else
 	    error = get_passwd_home(out, euid);
 
 	if (error == GIT_ENOTFOUND) {
-		git_error_clear();
+		giterr_clear();
 		error = 0;
 	}
 
@@ -142,11 +132,11 @@ static int git_sysdir_guess_xdg_dirs(git_buf *out)
 	}
 
 	if (error == GIT_ENOTFOUND) {
-		git_error_clear();
+		giterr_clear();
 		error = 0;
 	}
 
-	git_buf_dispose(&env);
+	git_buf_free(&env);
 	return error;
 #endif
 }
@@ -178,7 +168,7 @@ static void git_sysdir_global_shutdown(void)
 	size_t i;
 
 	for (i = 0; i < ARRAY_SIZE(git_sysdir__dirs); ++i)
-		git_buf_dispose(&git_sysdir__dirs[i].buf);
+		git_buf_free(&git_sysdir__dirs[i].buf);
 }
 
 int git_sysdir_global_init(void)
@@ -199,7 +189,7 @@ static int git_sysdir_check_selector(git_sysdir_t which)
 	if (which < ARRAY_SIZE(git_sysdir__dirs))
 		return 0;
 
-	git_error_set(GIT_ERROR_INVALID, "config directory selector out of range");
+	giterr_set(GITERR_INVALID, "config directory selector out of range");
 	return -1;
 }
 
@@ -210,7 +200,7 @@ int git_sysdir_get(const git_buf **out, git_sysdir_t which)
 
 	*out = NULL;
 
-	GIT_ERROR_CHECK_ERROR(git_sysdir_check_selector(which));
+	GITERR_CHECK_ERROR(git_sysdir_check_selector(which));
 
 	*out = &git_sysdir__dirs[which].buf;
 	return 0;
@@ -223,11 +213,11 @@ int git_sysdir_get_str(
 {
 	const git_buf *path = NULL;
 
-	GIT_ERROR_CHECK_ERROR(git_sysdir_check_selector(which));
-	GIT_ERROR_CHECK_ERROR(git_sysdir_get(&path, which));
+	GITERR_CHECK_ERROR(git_sysdir_check_selector(which));
+	GITERR_CHECK_ERROR(git_sysdir_get(&path, which));
 
 	if (!out || path->size >= outlen) {
-		git_error_set(GIT_ERROR_NOMEMORY, "buffer is too short for the path");
+		giterr_set(GITERR_NOMEMORY, "buffer is too short for the path");
 		return GIT_EBUFS;
 	}
 
@@ -242,7 +232,7 @@ int git_sysdir_set(git_sysdir_t which, const char *search_path)
 	const char *expand_path = NULL;
 	git_buf merge = GIT_BUF_INIT;
 
-	GIT_ERROR_CHECK_ERROR(git_sysdir_check_selector(which));
+	GITERR_CHECK_ERROR(git_sysdir_check_selector(which));
 
 	if (search_path != NULL)
 		expand_path = strstr(search_path, PATH_MAGIC);
@@ -272,7 +262,7 @@ int git_sysdir_set(git_sysdir_t which, const char *search_path)
 		git_buf_join(&merge, GIT_PATH_LIST_SEPARATOR, merge.ptr, expand_path);
 
 	git_buf_swap(&git_sysdir__dirs[which].buf, &merge);
-	git_buf_dispose(&merge);
+	git_buf_free(&merge);
 
 done:
 	if (git_buf_oom(&git_sysdir__dirs[which].buf))
@@ -291,7 +281,7 @@ static int git_sysdir_find_in_dirlist(
 	const char *scan, *next = NULL;
 	const git_buf *syspath;
 
-	GIT_ERROR_CHECK_ERROR(git_sysdir_get(&syspath, which));
+	GITERR_CHECK_ERROR(git_sysdir_get(&syspath, which));
 	if (!syspath || !git_buf_len(syspath))
 		goto done;
 
@@ -308,17 +298,17 @@ static int git_sysdir_find_in_dirlist(
 		if (!len)
 			continue;
 
-		GIT_ERROR_CHECK_ERROR(git_buf_set(path, scan, len));
+		GITERR_CHECK_ERROR(git_buf_set(path, scan, len));
 		if (name)
-			GIT_ERROR_CHECK_ERROR(git_buf_joinpath(path, path->ptr, name));
+			GITERR_CHECK_ERROR(git_buf_joinpath(path, path->ptr, name));
 
 		if (git_path_exists(path->ptr))
 			return 0;
 	}
 
 done:
-	git_buf_dispose(path);
-	git_error_set(GIT_ERROR_OS, "the %s file '%s' doesn't exist", label, name);
+	git_buf_free(path);
+	giterr_set(GITERR_OS, "the %s file '%s' doesn't exist", label, name);
 	return GIT_ENOTFOUND;
 }
 

data/vendor/libgit2/src/tag.c

@@ -10,7 +10,6 @@
 #include "commit.h"
 #include "signature.h"
 #include "message.h"
-#include "wildmatch.h"
 #include "git2/object.h"
 #include "git2/repository.h"
 #include "git2/signature.h"
@@ -37,7 +36,7 @@ const git_oid *git_tag_target_id(const git_tag *t)
 	return &t->target;
 }
 
-git_object_t git_tag_target_type(const git_tag *t)
+git_otype git_tag_target_type(const git_tag *t)
 {
 	assert(t);
 	return t->type;
@@ -62,7 +61,7 @@ const char *git_tag_message(const git_tag *t)
 
 static int tag_error(const char *str)
 {
-	git_error_set(GIT_ERROR_TAG, "failed to parse tag: %s", str);
+	giterr_set(GITERR_TAG, "failed to parse tag: %s", str);
 	return -1;
 }
 
@@ -85,7 +84,7 @@ static int tag_parse(git_tag *tag, const char *buffer, const char *buffer_end)
 		return tag_error("type field not found");
 	buffer += 5;
 
-	tag->type = GIT_OBJECT_INVALID;
+	tag->type = GIT_OBJ_BAD;
 
 	for (i = 1; i < ARRAY_SIZE(tag_types); ++i) {
 		size_t type_length = strlen(tag_types[i]);
@@ -100,7 +99,7 @@ static int tag_parse(git_tag *tag, const char *buffer, const char *buffer_end)
 		}
 	}
 
-	if (tag->type == GIT_OBJECT_INVALID)
+	if (tag->type == GIT_OBJ_BAD)
 		return tag_error("invalid object type");
 
 	if (buffer + 4 >= buffer_end)
@@ -117,9 +116,9 @@ static int tag_parse(git_tag *tag, const char *buffer, const char *buffer_end)
 
 	text_len = search - buffer;
 
-	GIT_ERROR_CHECK_ALLOC_ADD(&alloc_len, text_len, 1);
+	GITERR_CHECK_ALLOC_ADD(&alloc_len, text_len, 1);
 	tag->tag_name = git__malloc(alloc_len);
-	GIT_ERROR_CHECK_ALLOC(tag->tag_name);
+	GITERR_CHECK_ALLOC(tag->tag_name);
 
 	memcpy(tag->tag_name, buffer, text_len);
 	tag->tag_name[text_len] = '\0';
@@ -129,7 +128,7 @@ static int tag_parse(git_tag *tag, const char *buffer, const char *buffer_end)
 	tag->tagger = NULL;
 	if (buffer < buffer_end && *buffer != '\n') {
 		tag->tagger = git__malloc(sizeof(git_signature));
-		GIT_ERROR_CHECK_ALLOC(tag->tagger);
+		GITERR_CHECK_ALLOC(tag->tagger);
 
 		if (git_signature__parse(tag->tagger, &buffer, buffer_end, "tagger ", '\n') < 0)
 			return -1;
@@ -149,9 +148,9 @@ static int tag_parse(git_tag *tag, const char *buffer, const char *buffer_end)
 
 		text_len = buffer_end - ++buffer;
 
-		GIT_ERROR_CHECK_ALLOC_ADD(&alloc_len, text_len, 1);
+		GITERR_CHECK_ALLOC_ADD(&alloc_len, text_len, 1);
 		tag->message = git__malloc(alloc_len);
-		GIT_ERROR_CHECK_ALLOC(tag->message);
+		GITERR_CHECK_ALLOC(tag->message);
 
 		memcpy(tag->message, buffer, text_len);
 		tag->message[text_len] = '\0';
@@ -160,11 +159,6 @@ static int tag_parse(git_tag *tag, const char *buffer, const char *buffer_end)
 	return 0;
 }
 
-int git_tag__parse_raw(void *_tag, const char *data, size_t size)
-{
-	return tag_parse(_tag, data, data + size);
-}
-
 int git_tag__parse(void *_tag, git_odb_object *odb_obj)
 {
 	git_tag *tag = _tag;
@@ -232,15 +226,15 @@ static int write_tag_annotation(
 	if (git_repository_odb__weakptr(&odb, repo) < 0)
 		goto on_error;
 
-	if (git_odb_write(oid, odb, tag.ptr, tag.size, GIT_OBJECT_TAG) < 0)
+	if (git_odb_write(oid, odb, tag.ptr, tag.size, GIT_OBJ_TAG) < 0)
 		goto on_error;
 
-	git_buf_dispose(&tag);
+	git_buf_free(&tag);
 	return 0;
 
 on_error:
-	git_buf_dispose(&tag);
-	git_error_set(GIT_ERROR_OBJECT, "failed to create tag annotation");
+	git_buf_free(&tag);
+	giterr_set(GITERR_OBJECT, "failed to create tag annotation");
 	return -1;
 }
 
@@ -263,7 +257,7 @@ static int git_tag_create__internal(
 	assert(!create_tag_annotation || (tagger && message));
 
 	if (git_object_owner(target) != repo) {
-		git_error_set(GIT_ERROR_INVALID, "the given target does not belong to this repository");
+		giterr_set(GITERR_INVALID, "the given target does not belong to this repository");
 		return -1;
 	}
 
@@ -274,8 +268,8 @@ static int git_tag_create__internal(
 	/** Ensure the tag name doesn't conflict with an already existing
 	 *	reference unless overwriting has explicitly been requested **/
 	if (error == 0 && !allow_ref_overwrite) {
-		git_buf_dispose(&ref_name);
-		git_error_set(GIT_ERROR_TAG, "tag already exists");
+		git_buf_free(&ref_name);
+		giterr_set(GITERR_TAG, "tag already exists");
 		return GIT_EEXISTS;
 	}
 
@@ -289,7 +283,7 @@ static int git_tag_create__internal(
 
 cleanup:
 	git_reference_free(new_ref);
-	git_buf_dispose(&ref_name);
+	git_buf_free(&ref_name);
 	return error;
 }
 
@@ -328,7 +322,7 @@ int git_tag_create_lightweight(
 	return git_tag_create__internal(oid, repo, tag_name, target, NULL, NULL, allow_ref_overwrite, 0);
 }
 
-int git_tag_create_from_buffer(git_oid *oid, git_repository *repo, const char *buffer, int allow_ref_overwrite)
+int git_tag_create_frombuffer(git_oid *oid, git_repository *repo, const char *buffer, int allow_ref_overwrite)
 {
 	git_tag tag;
 	int error;
@@ -355,7 +349,7 @@ int git_tag_create_from_buffer(git_oid *oid, git_repository *repo, const char *b
 		goto on_error;
 
 	if (tag.type != target_obj->cached.type) {
-		git_error_set(GIT_ERROR_TAG, "the type for the given target is invalid");
+		giterr_set(GITERR_TAG, "the type for the given target is invalid");
 		goto on_error;
 	}
 
@@ -372,13 +366,13 @@ int git_tag_create_from_buffer(git_oid *oid, git_repository *repo, const char *b
 	/** Ensure the tag name doesn't conflict with an already existing
 	 *	reference unless overwriting has explicitly been requested **/
 	if (error == 0 && !allow_ref_overwrite) {
-		git_error_set(GIT_ERROR_TAG, "tag already exists");
+		giterr_set(GITERR_TAG, "tag already exists");
 		return GIT_EEXISTS;
 	}
 
 	/* write the buffer */
 	if ((error = git_odb_open_wstream(
-			&stream, odb, strlen(buffer), GIT_OBJECT_TAG)) < 0)
+			&stream, odb, strlen(buffer), GIT_OBJ_TAG)) < 0)
 		return error;
 
 	if (!(error = git_odb_stream_write(stream, buffer, strlen(buffer))))
@@ -387,7 +381,7 @@ int git_tag_create_from_buffer(git_oid *oid, git_repository *repo, const char *b
 	git_odb_stream_free(stream);
 
 	if (error < 0) {
-		git_buf_dispose(&ref_name);
+		git_buf_free(&ref_name);
 		return error;
 	}
 
@@ -395,7 +389,7 @@ int git_tag_create_from_buffer(git_oid *oid, git_repository *repo, const char *b
 		&new_ref, repo, ref_name.ptr, oid, allow_ref_overwrite, NULL);
 
 	git_reference_free(new_ref);
-	git_buf_dispose(&ref_name);
+	git_buf_free(&ref_name);
 
 	return error;
 
@@ -415,7 +409,7 @@ int git_tag_delete(git_repository *repo, const char *tag_name)
 
 	error = retrieve_tag_reference(&tag_ref, &ref_name, repo, tag_name);
 
-	git_buf_dispose(&ref_name);
+	git_buf_free(&ref_name);
 
 	if (error < 0)
 		return error;
@@ -444,7 +438,7 @@ static int tags_cb(const char *ref, void *data)
 
 	if (!(error = git_reference_name_to_id(&oid, d->repo, ref))) {
 		if ((error = d->cb(ref, &oid, d->cb_data)) != 0)
-			git_error_set_after_callback_function(error, "git_tag_foreach");
+			giterr_set_after_callback_function(error, "git_tag_foreach");
 	}
 
 	return error;
@@ -476,10 +470,10 @@ static int tag_list_cb(const char *tag_name, git_oid *oid, void *data)
 	GIT_UNUSED(oid);
 
 	if (!*filter->pattern ||
-	    wildmatch(filter->pattern, tag_name + GIT_REFS_TAGS_DIR_LEN, 0) == 0)
+		p_fnmatch(filter->pattern, tag_name + GIT_REFS_TAGS_DIR_LEN, 0) == 0)
 	{
 		char *matched = git__strdup(tag_name + GIT_REFS_TAGS_DIR_LEN);
-		GIT_ERROR_CHECK_ALLOC(matched);
+		GITERR_CHECK_ALLOC(matched);
 
 		return git_vector_insert(filter->taglist, matched);
 	}
@@ -519,12 +513,5 @@ int git_tag_list(git_strarray *tag_names, git_repository *repo)
 
 int git_tag_peel(git_object **tag_target, const git_tag *tag)
 {
-	return git_object_peel(tag_target, (const git_object *)tag, GIT_OBJECT_ANY);
-}
-
-/* Deprecated Functions */
-
-int git_tag_create_frombuffer(git_oid *oid, git_repository *repo, const char *buffer, int allow_ref_overwrite)
-{
-	return git_tag_create_from_buffer(oid, repo, buffer, allow_ref_overwrite);
+	return git_object_peel(tag_target, (const git_object *)tag, GIT_OBJ_ANY);
 }

data/vendor/libgit2/src/tag.h

@@ -17,7 +17,7 @@ struct git_tag {
 	git_object object;
 
 	git_oid target;
-	git_object_t type;
+	git_otype type;
 
 	char *tag_name;
 	git_signature *tagger;
@@ -26,6 +26,5 @@ struct git_tag {
 
 void git_tag__free(void *tag);
 int git_tag__parse(void *tag, git_odb_object *obj);
-int git_tag__parse_raw(void *tag, const char *data, size_t size);
 
 #endif

data/vendor/libgit2/src/trace.c

@@ -17,7 +17,7 @@ struct git_trace_data git_trace__data = {0};
 
 #endif
 
-int git_trace_set(git_trace_level_t level, git_trace_cb callback)
+int git_trace_set(git_trace_level_t level, git_trace_callback callback)
 {
 #ifdef GIT_TRACE
 	assert(level == 0 || callback != NULL);
@@ -31,7 +31,7 @@ int git_trace_set(git_trace_level_t level, git_trace_cb callback)
 	GIT_UNUSED(level);
 	GIT_UNUSED(callback);
 
-	git_error_set(GIT_ERROR_INVALID,
+	giterr_set(GITERR_INVALID,
 		"this version of libgit2 was not built with tracing.");
 	return -1;
 #endif

data/vendor/libgit2/src/trace.h

@@ -16,7 +16,7 @@
 
 struct git_trace_data {
 	git_trace_level_t level;
-	git_trace_cb callback;
+	git_trace_callback callback;
 };
 
 extern struct git_trace_data git_trace__data;
@@ -25,7 +25,7 @@ GIT_INLINE(void) git_trace__write_fmt(
 	git_trace_level_t level,
 	const char *fmt, ...)
 {
-	git_trace_cb callback = git_trace__data.callback;
+	git_trace_callback callback = git_trace__data.callback;
 	git_buf message = GIT_BUF_INIT;
 	va_list ap;
 
@@ -35,7 +35,7 @@ GIT_INLINE(void) git_trace__write_fmt(
 
 	callback(level, git_buf_cstr(&message));
 
-	git_buf_dispose(&message);
+	git_buf_free(&message);
 }
 
 #define git_trace_level()		(git_trace__data.level)

data/vendor/libgit2/src/trailer.c

@@ -36,25 +36,21 @@ static const char *next_line(const char *str)
 	if (nl) {
 		return nl + 1;
 	} else {
-		/* return pointer to the NUL terminator: */
+		// return pointer to the NUL terminator:
 		return str + strlen(str);
 	}
 }
 
 /*
- * Return the position of the start of the last line. If len is 0, return 0.
+ * Return the position of the start of the last line. If len is 0, return -1.
  */
-static bool last_line(size_t *out, const char *buf, size_t len)
+static int last_line(const char *buf, size_t len)
 {
-	size_t i;
-
-	*out = 0;
-
+	int i;
 	if (len == 0)
-		return false;
+		return -1;
 	if (len == 1)
-		return true;
-
+		return 0;
 	/*
 	 * Skip the last character (in addition to the null terminator),
 	 * because if the last character is a newline, it is considered as part
@@ -62,37 +58,31 @@ static bool last_line(size_t *out, const char *buf, size_t len)
 	 */
 	i = len - 2;
 
-	for (; i > 0; i--) {
-		if (buf[i] == '\n') {
-			*out = i + 1;
-			return true;
-		}
+	for (; i >= 0; i--) {
+		if (buf[i] == '\n')
+			return i + 1;
 	}
-	return true;
+	return 0;
 }
 
 /*
  * If the given line is of the form
- * "<token><optional whitespace><separator>..." or "<separator>...", sets out
- * to the location of the separator and returns true.  Otherwise, returns
- * false.  The optional whitespace is allowed there primarily to allow things
- * like "Bug #43" where <token> is "Bug" and <separator> is "#".
+ * "<token><optional whitespace><separator>..." or "<separator>...", return the
+ * location of the separator. Otherwise, return -1.  The optional whitespace
+ * is allowed there primarily to allow things like "Bug #43" where <token> is
+ * "Bug" and <separator> is "#".
  *
- * The separator-starts-line case (in which this function returns true and
- * sets out to 0) is distinguished from the non-well-formed-line case (in
- * which this function returns false) because some callers of this function
- * need such a distinction.
+ * The separator-starts-line case (in which this function returns 0) is
+ * distinguished from the non-well-formed-line case (in which this function
+ * returns -1) because some callers of this function need such a distinction.
  */
-static bool find_separator(size_t *out, const char *line, const char *separators)
+static int find_separator(const char *line, const char *separators)
 {
 	int whitespace_found = 0;
 	const char *c;
 	for (c = line; *c; c++) {
-		if (strchr(separators, *c)) {
-			*out = c - line;
-			return true;
-		}
-
+		if (strchr(separators, *c))
+			return c - line;
 		if (!whitespace_found && (isalnum(*c) || *c == '-'))
 			continue;
 		if (c != line && (*c == ' ' || *c == '\t')) {
@@ -101,7 +91,7 @@ static bool find_separator(size_t *out, const char *line, const char *separators
 		}
 		break;
 	}
-	return false;
+	return -1;
 }
 
 /*
@@ -114,9 +104,10 @@ static bool find_separator(size_t *out, const char *line, const char *separators
  * Returns the number of bytes from the tail to ignore, to be fed as
  * the second parameter to append_signoff().
  */
-static size_t ignore_non_trailer(const char *buf, size_t len)
+static int ignore_non_trailer(const char *buf, size_t len)
 {
-	size_t boc = 0, bol = 0;
+	int boc = 0;
+	size_t bol = 0;
 	int in_old_conflicts_block = 0;
 	size_t cutoff = len;
 
@@ -153,7 +144,7 @@ static size_t ignore_non_trailer(const char *buf, size_t len)
  * Return the position of the start of the patch or the length of str if there
  * is no patch in the message.
  */
-static size_t find_patch_start(const char *str)
+static int find_patch_start(const char *str)
 {
 	const char *s;
 
@@ -169,11 +160,10 @@ static size_t find_patch_start(const char *str)
  * Return the position of the first trailer line or len if there are no
  * trailers.
  */
-static size_t find_trailer_start(const char *buf, size_t len)
+static int find_trailer_start(const char *buf, size_t len)
 {
 	const char *s;
-	size_t end_of_title, l;
-	int only_spaces = 1;
+	int end_of_title, l, only_spaces = 1;
 	int recognized_prefix = 0, trailer_lines = 0, non_trailer_lines = 0;
 	/*
 	 * Number of possible continuation lines encountered. This will be
@@ -199,11 +189,12 @@ static size_t find_trailer_start(const char *buf, size_t len)
 	 * trailers, or (ii) contains at least one Git-generated trailer and
 	 * consists of at least 25% trailers.
 	 */
-	l = len;
-	while (last_line(&l, buf, l) && l >= end_of_title) {
+	for (l = last_line(buf, len);
+	     l >= end_of_title;
+	     l = last_line(buf, l)) {
 		const char *bol = buf + l;
 		const char *const *p;
-		size_t separator_pos = 0;
+		int separator_pos;
 
 		if (bol[0] == COMMENT_LINE_CHAR) {
 			non_trailer_lines += possible_continuation_lines;
@@ -232,7 +223,7 @@ static size_t find_trailer_start(const char *buf, size_t len)
 			}
 		}
 
-		find_separator(&separator_pos, bol, TRAILER_SEPARATORS);
+		separator_pos = find_separator(bol, TRAILER_SEPARATORS);
 		if (separator_pos >= 1 && !isspace(bol[0])) {
 			trailer_lines++;
 			possible_continuation_lines = 0;
@@ -253,7 +244,7 @@ continue_outer_loop:
 }
 
 /* Return the position of the end of the trailers. */
-static size_t find_trailer_end(const char *buf, size_t len)
+static int find_trailer_end(const char *buf, size_t len)
 {
 	return len - ignore_non_trailer(buf, len);
 }
@@ -267,9 +258,6 @@ static char *extract_trailer_block(const char *message, size_t* len)
 	size_t trailer_len = trailer_end - trailer_start;
 
 	char *buffer = git__malloc(trailer_len + 1);
-	if (buffer == NULL)
-		return NULL;
-
 	memcpy(buffer, message + trailer_start, trailer_len);
 	buffer[trailer_len] = 0;
 
@@ -305,8 +293,6 @@ int git_message_trailers(git_message_trailer_array *trailer_arr, const char *mes
 
 	size_t trailer_len;
 	char *trailer = extract_trailer_block(message, &trailer_len);
-	if (trailer == NULL)
-		return -1;
 
 	for (ptr = trailer;;) {
 		switch (state) {
@@ -324,12 +310,12 @@ int git_message_trailers(git_message_trailer_array *trailer_arr, const char *mes
 				}
 
 				if (isalnum(*ptr) || *ptr == '-') {
-					/* legal key character */
+					// legal key character
 					NEXT(S_KEY);
 				}
 
 				if (*ptr == ' ' || *ptr == '\t') {
-					/* optional whitespace before separator */
+					// optional whitespace before separator
 					*ptr = 0;
 					NEXT(S_KEY_WS);
 				}
@@ -339,7 +325,7 @@ int git_message_trailers(git_message_trailer_array *trailer_arr, const char *mes
 					NEXT(S_SEP_WS);
 				}
 
-				/* illegal character */
+				// illegal character
 				GOTO(S_IGNORE);
 			}
 			case S_KEY_WS: {
@@ -355,7 +341,7 @@ int git_message_trailers(git_message_trailer_array *trailer_arr, const char *mes
 					NEXT(S_SEP_WS);
 				}
 
-				/* illegal character */
+				// illegal character
 				GOTO(S_IGNORE);
 			}
 			case S_SEP_WS: {
@@ -383,7 +369,7 @@ int git_message_trailers(git_message_trailer_array *trailer_arr, const char *mes
 			}
 			case S_VALUE_NL: {
 				if (*ptr == ' ') {
-					/* continuation; */
+					// continuation;
 					NEXT(S_VALUE);
 				}