rugged 0.28.4 → 0.28.4.1

data/vendor/libgit2/src/revwalk.h

@@ -50,24 +50,4 @@ struct git_revwalk {
 
 git_commit_list_node *git_revwalk__commit_lookup(git_revwalk *walk, const git_oid *oid);
 
-typedef struct {
-	int uninteresting;
-	int from_glob;
-	int insert_by_date;
-} git_revwalk__push_options;
-
-#define GIT_REVWALK__PUSH_OPTIONS_INIT { 0 }
-
-int git_revwalk__push_commit(git_revwalk *walk,
-	const git_oid *oid,
-	const git_revwalk__push_options *opts);
-
-int git_revwalk__push_ref(git_revwalk *walk,
-	const char *refname,
-	const git_revwalk__push_options *opts);
-
-int git_revwalk__push_glob(git_revwalk *walk,
-	const char *glob,
-	const git_revwalk__push_options *given_opts);
-
 #endif

data/vendor/libgit2/src/settings.c

@@ -57,7 +57,6 @@ int git_libgit2_features(void)
 extern size_t git_mwindow__window_size;
 extern size_t git_mwindow__mapped_limit;
 extern size_t git_indexer__max_objects;
-extern bool git_disable_pack_keep_file_checks;
 
 static int config_level_to_sysdir(int config_level)
 {
@@ -280,10 +279,6 @@ int git_libgit2_opts(int key, ...)
 		*(va_arg(ap, size_t *)) = git_indexer__max_objects;
 		break;
 
-	case GIT_OPT_DISABLE_PACK_KEEP_FILE_CHECKS:
-		git_disable_pack_keep_file_checks = (va_arg(ap, int) != 0);
-		break;
-
 	default:
 		git_error_set(GIT_ERROR_INVALID, "invalid option key");
 		error = -1;

data/vendor/libgit2/src/sortedcache.c

@@ -28,7 +28,7 @@ int git_sortedcache_new(
 	git_pool_init(&sc->pool, 1);
 
 	if (git_vector_init(&sc->items, 4, item_cmp) < 0 ||
-	    git_strmap_new(&sc->map) < 0)
+		git_strmap_alloc(&sc->map) < 0)
 		goto fail;
 
 	if (git_rwlock_init(&sc->lock)) {
@@ -270,19 +270,23 @@ int git_sortedcache_clear(git_sortedcache *sc, bool wlock)
 /* find and/or insert item, returning pointer to item data */
 int git_sortedcache_upsert(void **out, git_sortedcache *sc, const char *key)
 {
-	size_t keylen, itemlen;
+	size_t pos;
 	int error = 0;
-	char *item_key;
 	void *item;
+	size_t keylen, itemlen;
+	char *item_key;
 
-	if ((item = git_strmap_get(sc->map, key)) != NULL)
+	pos = git_strmap_lookup_index(sc->map, key);
+	if (git_strmap_valid_index(sc->map, pos)) {
+		item = git_strmap_value_at(sc->map, pos);
 		goto done;
+	}
 
 	keylen  = strlen(key);
 	itemlen = sc->item_path_offset + keylen + 1;
 	itemlen = (itemlen + 7) & ~7;
 
-	if ((item = git_pool_mallocz(&sc->pool, itemlen)) == NULL) {
+	if ((item = git_pool_mallocz(&sc->pool, (uint32_t)itemlen)) == NULL) {
 		/* don't use GIT_ERROR_CHECK_ALLOC b/c of lock */
 		error = -1;
 		goto done;
@@ -295,11 +299,17 @@ int git_sortedcache_upsert(void **out, git_sortedcache *sc, const char *key)
 	item_key = ((char *)item) + sc->item_path_offset;
 	memcpy(item_key, key, keylen);
 
-	if ((error = git_strmap_set(sc->map, item_key, item)) < 0)
+	pos = git_strmap_put(sc->map, item_key, &error);
+	if (error < 0)
 		goto done;
 
-	if ((error = git_vector_insert(&sc->items, item)) < 0)
-		git_strmap_delete(sc->map, item_key);
+	if (!error)
+		git_strmap_set_key_at(sc->map, pos, item_key);
+	git_strmap_set_value_at(sc->map, pos, item);
+
+	error = git_vector_insert(&sc->items, item);
+	if (error < 0)
+		git_strmap_delete_at(sc->map, pos);
 
 done:
 	if (out)
@@ -310,7 +320,10 @@ done:
 /* lookup item by key */
 void *git_sortedcache_lookup(const git_sortedcache *sc, const char *key)
 {
-	return git_strmap_get(sc->map, key);
+	size_t pos = git_strmap_lookup_index(sc->map, key);
+	if (git_strmap_valid_index(sc->map, pos))
+		return git_strmap_value_at(sc->map, pos);
+	return NULL;
 }
 
 /* find out how many items are in the cache */
@@ -358,9 +371,9 @@ int git_sortedcache_lookup_index(
 int git_sortedcache_remove(git_sortedcache *sc, size_t pos)
 {
 	char *item;
+	size_t mappos;
 
-	/*
-	 * Because of pool allocation, this can't actually remove the item,
+	/* because of pool allocation, this can't actually remove the item,
 	 * but we can remove it from the items vector and the hash table.
 	 */
 
@@ -371,7 +384,8 @@ int git_sortedcache_remove(git_sortedcache *sc, size_t pos)
 
 	(void)git_vector_remove(&sc->items, pos);
 
-	git_strmap_delete(sc->map, item + sc->item_path_offset);
+	mappos = git_strmap_lookup_index(sc->map, item + sc->item_path_offset);
+	git_strmap_delete_at(sc->map, mappos);
 
 	if (sc->free_item)
 		sc->free_item(sc->free_item_payload, item);

data/vendor/libgit2/src/sortedcache.h

@@ -10,7 +10,7 @@
 #include "common.h"
 
 #include "util.h"
-#include "futils.h"
+#include "fileops.h"
 #include "vector.h"
 #include "thread-utils.h"
 #include "pool.h"

data/vendor/libgit2/src/stash.c

@@ -398,23 +398,28 @@ static int commit_worktree(
 	git_commit *b_commit,
 	git_commit *u_commit)
 {
-	const git_commit *parents[] = {	NULL, NULL, NULL };
-	git_index *i_index = NULL, *r_index = NULL;
-	git_tree *w_tree = NULL;
-	int error = 0, ignorecase;
+	int error = 0;
+	git_tree *w_tree = NULL, *i_tree = NULL;
+	git_index *i_index = NULL;
+	const git_commit *parents[] = {	NULL, NULL,	NULL };
+	int ignorecase;
 
 	parents[0] = b_commit;
 	parents[1] = i_commit;
 	parents[2] = u_commit;
 
-	if ((error = git_repository_index(&r_index, repo) < 0) ||
-	    (error = git_index_new(&i_index)) < 0 ||
-	    (error = git_index__fill(i_index, &r_index->entries) < 0) ||
-	    (error = git_repository__configmap_lookup(&ignorecase, repo, GIT_CONFIGMAP_IGNORECASE)) < 0)
+	if ((error = git_commit_tree(&i_tree, i_commit)) < 0)
+		goto cleanup;
+
+	if ((error = git_index_new(&i_index)) < 0 ||
+		(error = git_repository__cvar(&ignorecase, repo, GIT_CVAR_IGNORECASE)) < 0)
 		goto cleanup;
 
 	git_index__set_ignore_case(i_index, ignorecase);
 
+	if ((error = git_index_read_tree(i_index, i_tree)) < 0)
+		goto cleanup;
+
 	if ((error = build_workdir_tree(&w_tree, repo, i_index, b_commit)) < 0)
 		goto cleanup;
 
@@ -431,39 +436,42 @@ static int commit_worktree(
 		parents);
 
 cleanup:
+	git_tree_free(i_tree);
 	git_tree_free(w_tree);
 	git_index_free(i_index);
-	git_index_free(r_index);
 	return error;
 }
 
-static int prepare_worktree_commit_message(git_buf *out, const char *user_message)
+static int prepare_worktree_commit_message(
+	git_buf* msg,
+	const char *user_message)
 {
 	git_buf buf = GIT_BUF_INIT;
-	int error = 0;
+	int error;
 
-	if (!user_message) {
-		git_buf_printf(&buf, "WIP on %s", git_buf_cstr(out));
-	} else {
+	if ((error = git_buf_set(&buf, git_buf_cstr(msg), git_buf_len(msg))) < 0)
+		return error;
+
+	git_buf_clear(msg);
+
+	if (!user_message)
+		git_buf_printf(msg, "WIP on %s", git_buf_cstr(&buf));
+	else {
 		const char *colon;
 
-		if ((colon = strchr(git_buf_cstr(out), ':')) == NULL)
+		if ((colon = strchr(git_buf_cstr(&buf), ':')) == NULL)
 			goto cleanup;
 
-		git_buf_puts(&buf, "On ");
-		git_buf_put(&buf, git_buf_cstr(out), colon - out->ptr);
-		git_buf_printf(&buf, ": %s\n", user_message);
+		git_buf_puts(msg, "On ");
+		git_buf_put(msg, git_buf_cstr(&buf), colon - buf.ptr);
+		git_buf_printf(msg, ": %s\n", user_message);
 	}
 
-	if (git_buf_oom(&buf)) {
-		error = -1;
-		goto cleanup;
-	}
-
-	git_buf_swap(out, &buf);
+	error = (git_buf_oom(msg) || git_buf_oom(&buf)) ? -1 : 0;
 
 cleanup:
 	git_buf_dispose(&buf);
+
 	return error;
 }
 
@@ -494,7 +502,10 @@ static int is_dirty_cb(const char *path, unsigned int status, void *payload)
 	return GIT_PASSTHROUGH;
 }
 
-static int ensure_there_are_changes_to_stash(git_repository *repo, uint32_t flags)
+static int ensure_there_are_changes_to_stash(
+	git_repository *repo,
+	bool include_untracked_files,
+	bool include_ignored_files)
 {
 	int error;
 	git_status_options opts = GIT_STATUS_OPTIONS_INIT;
@@ -502,11 +513,11 @@ static int ensure_there_are_changes_to_stash(git_repository *repo, uint32_t flag
 	opts.show  = GIT_STATUS_SHOW_INDEX_AND_WORKDIR;
 	opts.flags = GIT_STATUS_OPT_EXCLUDE_SUBMODULES;
 
-	if (flags & GIT_STASH_INCLUDE_UNTRACKED)
+	if (include_untracked_files)
 		opts.flags |= GIT_STATUS_OPT_INCLUDE_UNTRACKED |
 			GIT_STATUS_OPT_RECURSE_UNTRACKED_DIRS;
 
-	if (flags & GIT_STASH_INCLUDE_IGNORED)
+	if (include_ignored_files)
 		opts.flags |= GIT_STATUS_OPT_INCLUDE_IGNORED |
 			GIT_STATUS_OPT_RECURSE_IGNORED_DIRS;
 
@@ -521,14 +532,20 @@ static int ensure_there_are_changes_to_stash(git_repository *repo, uint32_t flag
 	return error;
 }
 
-static int reset_index_and_workdir(git_repository *repo, git_commit *commit, uint32_t flags)
+static int reset_index_and_workdir(
+	git_repository *repo,
+	git_commit *commit,
+	bool remove_untracked,
+	bool remove_ignored)
 {
 	git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT;
 
 	opts.checkout_strategy = GIT_CHECKOUT_FORCE;
-	if (flags & GIT_STASH_INCLUDE_UNTRACKED)
+
+	if (remove_untracked)
 		opts.checkout_strategy |= GIT_CHECKOUT_REMOVE_UNTRACKED;
-	if (flags & GIT_STASH_INCLUDE_IGNORED)
+
+	if (remove_ignored)
 		opts.checkout_strategy |= GIT_CHECKOUT_REMOVE_IGNORED;
 
 	return git_checkout_tree(repo, (git_object *)commit, &opts);
@@ -554,26 +571,31 @@ int git_stash_save(
 	if ((error = retrieve_base_commit_and_message(&b_commit, &msg, repo)) < 0)
 		goto cleanup;
 
-	if ((error = ensure_there_are_changes_to_stash(repo, flags)) < 0)
+	if ((error = ensure_there_are_changes_to_stash(
+		repo,
+		(flags & GIT_STASH_INCLUDE_UNTRACKED) != 0,
+		(flags & GIT_STASH_INCLUDE_IGNORED) != 0)) < 0)
 		goto cleanup;
 
 	if ((error = git_repository_index(&index, repo)) < 0)
 		goto cleanup;
 
-	if ((error = commit_index(&i_commit, repo, index, stasher,
-				  git_buf_cstr(&msg), b_commit)) < 0)
+	if ((error = commit_index(
+			&i_commit, repo, index, stasher, git_buf_cstr(&msg), b_commit)) < 0)
 		goto cleanup;
 
 	if ((flags & (GIT_STASH_INCLUDE_UNTRACKED | GIT_STASH_INCLUDE_IGNORED)) &&
-	    (error = commit_untracked(&u_commit, repo, stasher,
-				      git_buf_cstr(&msg), i_commit, flags)) < 0)
+		(error = commit_untracked(
+			&u_commit, repo, stasher, git_buf_cstr(&msg),
+			i_commit, flags)) < 0)
 		goto cleanup;
 
 	if ((error = prepare_worktree_commit_message(&msg, message)) < 0)
 		goto cleanup;
 
-	if ((error = commit_worktree(out, repo, stasher, git_buf_cstr(&msg),
-				     i_commit, b_commit, u_commit)) < 0)
+	if ((error = commit_worktree(
+			out, repo, stasher, git_buf_cstr(&msg),
+			i_commit, b_commit, u_commit)) < 0)
 		goto cleanup;
 
 	git_buf_rtrim(&msg);
@@ -581,8 +603,11 @@ int git_stash_save(
 	if ((error = update_reflog(out, repo, git_buf_cstr(&msg))) < 0)
 		goto cleanup;
 
-	if ((error = reset_index_and_workdir(repo, (flags & GIT_STASH_KEEP_INDEX) ? i_commit : b_commit,
-					     flags)) < 0)
+	if ((error = reset_index_and_workdir(
+		repo,
+		((flags & GIT_STASH_KEEP_INDEX) != 0) ? i_commit : b_commit,
+		(flags & GIT_STASH_INCLUDE_UNTRACKED) != 0,
+		(flags & GIT_STASH_INCLUDE_IGNORED) != 0)) < 0)
 		goto cleanup;
 
 cleanup:
@@ -769,18 +794,13 @@ static void normalize_apply_options(
 		opts->checkout_options.their_label = "Stashed changes";
 }
 
-int git_stash_apply_options_init(git_stash_apply_options *opts, unsigned int version)
+int git_stash_apply_init_options(git_stash_apply_options *opts, unsigned int version)
 {
 	GIT_INIT_STRUCTURE_FROM_TEMPLATE(
 		opts, version, git_stash_apply_options, GIT_STASH_APPLY_OPTIONS_INIT);
 	return 0;
 }
 
-int git_stash_apply_init_options(git_stash_apply_options *opts, unsigned int version)
-{
-	return git_stash_apply_options_init(opts, version);
-}
-
 #define NOTIFY_PROGRESS(opts, progress_type)				\
 	do {								\
 		if ((opts).progress_cb &&				\

data/vendor/libgit2/src/status.c

@@ -8,7 +8,7 @@
 #include "status.h"
 
 #include "git2.h"
-#include "futils.h"
+#include "fileops.h"
 #include "hash.h"
 #include "vector.h"
 #include "tree.h"
@@ -16,7 +16,6 @@
 #include "repository.h"
 #include "ignore.h"
 #include "index.h"
-#include "wildmatch.h"
 
 #include "git2/diff.h"
 #include "diff.h"
@@ -86,14 +85,14 @@ static unsigned int workdir_delta2status(
 			/* if OIDs don't match, we might need to calculate them now to
 			 * discern between RENAMED vs RENAMED+MODIFED
 			 */
-			if (git_oid_is_zero(&idx2wd->old_file.id) &&
+			if (git_oid_iszero(&idx2wd->old_file.id) &&
 				diff->old_src == GIT_ITERATOR_TYPE_WORKDIR &&
 				!git_diff__oid_for_file(
 					&idx2wd->old_file.id, diff, idx2wd->old_file.path,
 					idx2wd->old_file.mode, idx2wd->old_file.size))
 			idx2wd->old_file.flags |= GIT_DIFF_FLAG_VALID_ID;
 
-			if (git_oid_is_zero(&idx2wd->new_file.id) &&
+			if (git_oid_iszero(&idx2wd->new_file.id) &&
 				diff->new_src == GIT_ITERATOR_TYPE_WORKDIR &&
 				!git_diff__oid_for_file(
 					&idx2wd->new_file.id, diff, idx2wd->new_file.path,
@@ -281,7 +280,7 @@ int git_status_list_new(
 	if ((error = git_repository__ensure_not_bare(repo, "status")) < 0 ||
 		(error = git_repository_index(&index, repo)) < 0)
 		return error;
-
+	
 	if (opts != NULL && opts->baseline != NULL) {
 		head = opts->baseline;
 	} else {
@@ -457,7 +456,7 @@ struct status_file_info {
 	char *expected;
 	unsigned int count;
 	unsigned int status;
-	int wildmatch_flags;
+	int fnm_flags;
 	int ambiguous;
 };
 
@@ -469,11 +468,11 @@ static int get_one_status(const char *path, unsigned int status, void *data)
 	sfi->count++;
 	sfi->status = status;
 
-	strcomp = (sfi->wildmatch_flags & WM_CASEFOLD) ? git__strcasecmp : git__strcmp;
+	strcomp = (sfi->fnm_flags & FNM_CASEFOLD) ? git__strcasecmp : git__strcmp;
 
 	if (sfi->count > 1 ||
 		(strcomp(sfi->expected, path) != 0 &&
-		 wildmatch(sfi->expected, path, sfi->wildmatch_flags) != 0))
+		 p_fnmatch(sfi->expected, path, sfi->fnm_flags) != 0))
 	{
 		sfi->ambiguous = true;
 		return GIT_EAMBIGUOUS; /* git_error_set will be done by caller */
@@ -500,7 +499,7 @@ int git_status_file(
 	if ((sfi.expected = git__strdup(path)) == NULL)
 		return -1;
 	if (index->ignore_case)
-		sfi.wildmatch_flags = WM_CASEFOLD;
+		sfi.fnm_flags = FNM_CASEFOLD;
 
 	opts.show = GIT_STATUS_SHOW_INDEX_AND_WORKDIR;
 	opts.flags = GIT_STATUS_OPT_INCLUDE_IGNORED |
@@ -541,18 +540,13 @@ int git_status_should_ignore(
 	return git_ignore_path_is_ignored(ignored, repo, path);
 }
 
-int git_status_options_init(git_status_options *opts, unsigned int version)
+int git_status_init_options(git_status_options *opts, unsigned int version)
 {
 	GIT_INIT_STRUCTURE_FROM_TEMPLATE(
 		opts, version, git_status_options, GIT_STATUS_OPTIONS_INIT);
 	return 0;
 }
 
-int git_status_init_options(git_status_options *opts, unsigned int version)
-{
-	return git_status_options_init(opts, version);
-}
-
 int git_status_list_get_perfdata(
 	git_diff_perfdata *out, const git_status_list *status)
 {