rugged 1.7.2 → 1.9.4

data/vendor/libgit2/src/cli/opt_usage.c

@@ -5,35 +5,84 @@
  * a Linking Exception. For full terms see the included COPYING file.
  */
 
-#include "cli.h"
+#include "common.h"
 #include "str.h"
 
-static int print_spec_name(git_str *out, const cli_opt_spec *spec)
+#define is_switch_or_value(spec) \
+	((spec)->type == CLI_OPT_TYPE_SWITCH || \
+	 (spec)->type == CLI_OPT_TYPE_VALUE)
+
+static int print_spec_args(git_str *out, const cli_opt_spec *spec)
 {
-	if (spec->type == CLI_OPT_TYPE_VALUE && spec->alias &&
-	    !(spec->usage & CLI_OPT_USAGE_VALUE_OPTIONAL) &&
-	    !(spec->usage & CLI_OPT_USAGE_SHOW_LONG))
-		return git_str_printf(out, "-%c <%s>", spec->alias, spec->value_name);
-	if (spec->type == CLI_OPT_TYPE_VALUE && spec->alias &&
-	    !(spec->usage & CLI_OPT_USAGE_SHOW_LONG))
-		return git_str_printf(out, "-%c [<%s>]", spec->alias, spec->value_name);
-	if (spec->type == CLI_OPT_TYPE_VALUE &&
-	    !(spec->usage & CLI_OPT_USAGE_VALUE_OPTIONAL))
-		return git_str_printf(out, "--%s[=<%s>]", spec->name, spec->value_name);
-	if (spec->type == CLI_OPT_TYPE_VALUE)
-		return git_str_printf(out, "--%s=<%s>", spec->name, spec->value_name);
+	GIT_ASSERT(!is_switch_or_value(spec));
+
 	if (spec->type == CLI_OPT_TYPE_ARG)
 		return git_str_printf(out, "<%s>", spec->value_name);
 	if (spec->type == CLI_OPT_TYPE_ARGS)
 		return git_str_printf(out, "<%s>...", spec->value_name);
 	if (spec->type == CLI_OPT_TYPE_LITERAL)
 		return git_str_printf(out, "--");
-	if (spec->alias && !(spec->usage & CLI_OPT_USAGE_SHOW_LONG))
+
+	GIT_ASSERT(!"unknown option spec type");
+	return -1;
+}
+
+GIT_INLINE(int) print_spec_alias(git_str *out, const cli_opt_spec *spec)
+{
+	GIT_ASSERT(is_switch_or_value(spec) && spec->alias);
+
+	if (spec->type == CLI_OPT_TYPE_VALUE &&
+	    !(spec->usage & CLI_OPT_USAGE_VALUE_OPTIONAL))
+		return git_str_printf(out, "-%c <%s>", spec->alias, spec->value_name);
+	else if (spec->type == CLI_OPT_TYPE_VALUE)
+		return git_str_printf(out, "-%c [<%s>]", spec->alias, spec->value_name);
+	else
 		return git_str_printf(out, "-%c", spec->alias);
-	if (spec->name)
+}
+
+GIT_INLINE(int) print_spec_name(git_str *out, const cli_opt_spec *spec)
+{
+	GIT_ASSERT(is_switch_or_value(spec) && spec->name);
+
+	if (spec->type == CLI_OPT_TYPE_VALUE &&
+	    !(spec->usage & CLI_OPT_USAGE_VALUE_OPTIONAL))
+		return git_str_printf(out, "--%s=<%s>", spec->name, spec->value_name);
+	else if (spec->type == CLI_OPT_TYPE_VALUE)
+		return git_str_printf(out, "--%s[=<%s>]", spec->name, spec->value_name);
+	else
 		return git_str_printf(out, "--%s", spec->name);
+}
+
+GIT_INLINE(int) print_spec_full(git_str *out, const cli_opt_spec *spec)
+{
+	int error = 0;
 
-	GIT_ASSERT(0);
+	if (is_switch_or_value(spec)) {
+		if (spec->alias)
+			error |= print_spec_alias(out, spec);
+
+		if (spec->alias && spec->name)
+			error |= git_str_printf(out, ", ");
+
+		if (spec->name)
+			error |= print_spec_name(out, spec);
+	} else {
+		error |= print_spec_args(out, spec);
+	}
+
+	return error;
+}
+
+GIT_INLINE(int) print_spec(git_str *out, const cli_opt_spec *spec)
+{
+	if (is_switch_or_value(spec)) {
+		if (spec->alias && !(spec->usage & CLI_OPT_USAGE_SHOW_LONG))
+			return print_spec_alias(out, spec);
+		else
+			return print_spec_name(out, spec);
+	}
+
+	return print_spec_args(out, spec);
 }
 
 /*
@@ -46,7 +95,8 @@ int cli_opt_usage_fprint(
 	FILE *file,
 	const char *command,
 	const char *subcommand,
-	const cli_opt_spec specs[])
+	const cli_opt_spec specs[],
+	unsigned int print_flags)
 {
 	git_str usage = GIT_BUF_INIT, opt = GIT_BUF_INIT;
 	const cli_opt_spec *spec;
@@ -55,7 +105,7 @@ int cli_opt_usage_fprint(
 	int error;
 
 	/* TODO: query actual console width. */
-	int console_width = 80;
+	int console_width = 78;
 
 	if ((error = git_str_printf(&usage, "usage: %s", command)) < 0)
 		goto done;
@@ -73,7 +123,8 @@ int cli_opt_usage_fprint(
 
 		next_choice = !!((spec + 1)->usage & CLI_OPT_USAGE_CHOICE);
 
-		if (spec->usage & CLI_OPT_USAGE_HIDDEN)
+		if ((spec->usage & CLI_OPT_USAGE_HIDDEN) &&
+		    !(print_flags & CLI_OPT_USAGE_SHOW_HIDDEN))
 			continue;
 
 		if (choice)
@@ -86,7 +137,7 @@ int cli_opt_usage_fprint(
 		if (!optional && !choice && next_choice)
 			git_str_putc(&opt, '(');
 
-		if ((error = print_spec_name(&opt, spec)) < 0)
+		if ((error = print_spec(&opt, spec)) < 0)
 			goto done;
 
 		if (!optional && choice && !next_choice)
@@ -111,11 +162,11 @@ int cli_opt_usage_fprint(
 				git_str_putc(&usage, ' ');
 
 			linelen = prefixlen;
-		} else {
-			git_str_putc(&usage, ' ');
-			linelen += git_str_len(&opt) + 1;
 		}
 
+		git_str_putc(&usage, ' ');
+		linelen += git_str_len(&opt) + 1;
+
 		git_str_puts(&usage, git_str_cstr(&opt));
 
 		if (git_str_oom(&usage)) {
@@ -140,7 +191,7 @@ int cli_opt_usage_error(
 	const cli_opt *invalid_opt)
 {
 	cli_opt_status_fprint(stderr, PROGRAM_NAME, invalid_opt);
-	cli_opt_usage_fprint(stderr, PROGRAM_NAME, subcommand, specs);
+	cli_opt_usage_fprint(stderr, PROGRAM_NAME, subcommand, specs, 0);
 	return CLI_EXIT_USAGE;
 }
 
@@ -150,35 +201,53 @@ int cli_opt_help_fprint(
 {
 	git_str help = GIT_BUF_INIT;
 	const cli_opt_spec *spec;
+	bool required = true;
 	int error = 0;
 
 	/* Display required arguments first */
 	for (spec = specs; spec->type; ++spec) {
-		if (! (spec->usage & CLI_OPT_USAGE_REQUIRED) ||
-		    (spec->usage & CLI_OPT_USAGE_HIDDEN))
+		if ((spec->usage & CLI_OPT_USAGE_HIDDEN) ||
+		    (spec->type == CLI_OPT_TYPE_LITERAL))
+			continue;
+
+		required = ((spec->usage & CLI_OPT_USAGE_REQUIRED) ||
+		    ((spec->usage & CLI_OPT_USAGE_CHOICE) && required));
+
+		if (!required)
 			continue;
 
 		git_str_printf(&help, "    ");
 
-		if ((error = print_spec_name(&help, spec)) < 0)
+		if ((error = print_spec_full(&help, spec)) < 0)
 			goto done;
 
-		git_str_printf(&help, ": %s\n", spec->help);
+		git_str_printf(&help, "\n");
+
+		if (spec->help)
+			git_str_printf(&help, "        %s\n", spec->help);
 	}
 
 	/* Display the remaining arguments */
 	for (spec = specs; spec->type; ++spec) {
-		if ((spec->usage & CLI_OPT_USAGE_REQUIRED) ||
-		    (spec->usage & CLI_OPT_USAGE_HIDDEN))
+		if ((spec->usage & CLI_OPT_USAGE_HIDDEN) ||
+		    (spec->type == CLI_OPT_TYPE_LITERAL))
+			continue;
+
+		required = ((spec->usage & CLI_OPT_USAGE_REQUIRED) ||
+		    ((spec->usage & CLI_OPT_USAGE_CHOICE) && required));
+
+		if (required)
 			continue;
 
 		git_str_printf(&help, "    ");
 
-		if ((error = print_spec_name(&help, spec)) < 0)
+		if ((error = print_spec_full(&help, spec)) < 0)
 			goto done;
 
-		git_str_printf(&help, ": %s\n", spec->help);
+		git_str_printf(&help, "\n");
 
+		if (spec->help)
+			git_str_printf(&help, "        %s\n", spec->help);
 	}
 
 	if (git_str_oom(&help) ||

data/vendor/libgit2/src/cli/opt_usage.h

@@ -8,6 +8,10 @@
 #ifndef CLI_opt_usage_h__
 #define CLI_opt_usage_h__
 
+typedef enum {
+	CLI_OPT_USAGE_SHOW_HIDDEN = (1 << 0),
+} cli_opt_usage_flags;
+
 /**
  * Prints usage information to the given file handle.
  *
@@ -21,7 +25,8 @@ int cli_opt_usage_fprint(
 	FILE *file,
 	const char *command,
 	const char *subcommand,
-	const cli_opt_spec specs[]);
+	const cli_opt_spec specs[],
+	unsigned int print_flags);
 
 int cli_opt_usage_error(
 	const char *subcommand,

data/vendor/libgit2/src/cli/progress.c

@@ -242,7 +242,21 @@ static int fetch_receiving(
 		done ? ", done." : "");
 }
 
-static int fetch_resolving(
+static int indexer_indexing(
+	cli_progress *progress,
+	const git_indexer_progress *stats)
+{
+	bool done = (stats->received_objects == stats->total_objects);
+
+	return progress_printf(progress, false,
+		"Indexing objects: %3d%% (%d/%d)%s\r",
+		percent(stats->received_objects, stats->total_objects),
+		stats->received_objects,
+		stats->total_objects,
+		done ? ", done." : "");
+}
+
+static int indexer_resolving(
 	cli_progress *progress,
 	const git_indexer_progress *stats)
 {
@@ -283,7 +297,42 @@ int cli_progress_fetch_transfer(const git_indexer_progress *stats, void *payload
 		/* fall through */
 
 	case CLI_PROGRESS_RESOLVING:
-		error = fetch_resolving(progress, stats);
+		error = indexer_resolving(progress, stats);
+		break;
+
+	default:
+		/* should not be reached */
+		GIT_ASSERT(!"unexpected progress state");
+	}
+
+	return error;
+}
+
+int cli_progress_indexer(
+	const git_indexer_progress *stats,
+	void *payload)
+{
+	cli_progress *progress = (cli_progress *)payload;
+	int error = 0;
+
+	switch (progress->action) {
+	case CLI_PROGRESS_NONE:
+		progress->action = CLI_PROGRESS_INDEXING;
+		/* fall through */
+
+	case CLI_PROGRESS_INDEXING:
+		if ((error = indexer_indexing(progress, stats)) < 0)
+			break;
+
+		if (stats->indexed_deltas == stats->total_deltas)
+			break;
+
+		progress_complete(progress);
+		progress->action = CLI_PROGRESS_RESOLVING;
+		/* fall through */
+
+	case CLI_PROGRESS_RESOLVING:
+		error = indexer_resolving(progress, stats);
 		break;
 
 	default:

data/vendor/libgit2/src/cli/progress.h

@@ -22,6 +22,7 @@
 typedef enum {
 	CLI_PROGRESS_NONE,
 	CLI_PROGRESS_RECEIVING,
+	CLI_PROGRESS_INDEXING,
 	CLI_PROGRESS_RESOLVING,
 	CLI_PROGRESS_CHECKING_OUT
 } cli_progress_t;
@@ -74,6 +75,17 @@ extern int cli_progress_fetch_transfer(
 	const git_indexer_progress *stats,
 	void *payload);
 
+/**
+ * Prints indexer progress to the console. Suitable for a
+ * `progress_cb` callback for `git_indexer_options`.
+ *
+ * @param stats The indexer stats
+ * @param payload A pointer to the cli_progress
+ */
+extern int cli_progress_indexer(
+	const git_indexer_progress *stats,
+	void *payload);
+
 /**
  * Prints checkout progress to the console.  Suitable for a
  * `progress_cb` callback for `git_checkout_options`.

data/vendor/libgit2/src/cli/unix/sighandler.c

@@ -8,7 +8,8 @@
 #include <stdint.h>
 #include <signal.h>
 #include "git2_util.h"
-#include "cli.h"
+#include "common.h"
+#include "sighandler.h"
 
 static void (*interrupt_handler)(void) = NULL;
 

data/vendor/libgit2/src/cli/win32/precompiled.h

@@ -1,3 +1,3 @@
 #include <git2.h>
 
-#include "cli.h"
+#include "common.h"

data/vendor/libgit2/src/cli/win32/sighandler.c

@@ -8,7 +8,7 @@
 #include "git2_util.h"
 #include <windows.h>
 
-#include "cli.h"
+#include "sighandler.h"
 
 static void (*interrupt_handler)(void) = NULL;
 

data/vendor/libgit2/src/libgit2/CMakeLists.txt

@@ -2,17 +2,15 @@
 # git library functionality.
 
 add_library(libgit2 OBJECT)
-set_target_properties(libgit2 PROPERTIES C_STANDARD 90)
-set_target_properties(libgit2 PROPERTIES C_EXTENSIONS OFF)
 
 include(PkgBuildConfig)
+include(CMakePackageConfigHelpers)
 
 set(LIBGIT2_INCLUDES
-	"${PROJECT_BINARY_DIR}/src/util"
-	"${PROJECT_BINARY_DIR}/include"
 	"${PROJECT_SOURCE_DIR}/src/libgit2"
 	"${PROJECT_SOURCE_DIR}/src/util"
-	"${PROJECT_SOURCE_DIR}/include")
+	"${PROJECT_SOURCE_DIR}/include"
+	"${PROJECT_BINARY_DIR}/gen_headers")
 
 # Collect sourcefiles
 file(GLOB SRC_H
@@ -42,7 +40,11 @@ ide_split_sources(libgit2)
 list(APPEND LIBGIT2_OBJECTS $<TARGET_OBJECTS:util> $<TARGET_OBJECTS:libgit2> ${LIBGIT2_DEPENDENCY_OBJECTS})
 list(APPEND LIBGIT2_INCLUDES ${LIBGIT2_DEPENDENCY_INCLUDES})
 
-target_include_directories(libgit2 PRIVATE ${LIBGIT2_INCLUDES} ${LIBGIT2_DEPENDENCY_INCLUDES} PUBLIC ${PROJECT_SOURCE_DIR}/include)
+target_include_directories(libgit2
+	PRIVATE ${LIBGIT2_INCLUDES} ${LIBGIT2_DEPENDENCY_INCLUDES}
+	PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
+	       $<INSTALL_INTERFACE:include>)
+
 target_include_directories(libgit2 SYSTEM PRIVATE ${LIBGIT2_SYSTEM_INCLUDES})
 
 set(LIBGIT2_INCLUDES ${LIBGIT2_INCLUDES} PARENT_SCOPE)
@@ -56,21 +58,23 @@ set(LIBGIT2_SYSTEM_LIBS ${LIBGIT2_SYSTEM_LIBS} PARENT_SCOPE)
 # Compile and link libgit2
 #
 
+if (NOT BUILD_SHARED_LIBS AND XCODE_VERSION)
+	# This is required for Xcode to actually create the static libgit2 library
+	file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/dummy.c "")
+	list(APPEND LIBGIT2_OBJECTS ${CMAKE_CURRENT_BINARY_DIR}/dummy.c)
+endif()
+
 add_library(libgit2package ${SRC_RC} ${LIBGIT2_OBJECTS})
 target_link_libraries(libgit2package ${LIBGIT2_SYSTEM_LIBS})
 target_include_directories(libgit2package SYSTEM PRIVATE ${LIBGIT2_INCLUDES})
+target_include_directories(libgit2package INTERFACE $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
 
 set_target_properties(libgit2package PROPERTIES C_STANDARD 90)
+set_target_properties(libgit2package PROPERTIES C_EXTENSIONS OFF)
 set_target_properties(libgit2package PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
 set_target_properties(libgit2package PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
 set_target_properties(libgit2package PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
 
-# Workaround for Cmake bug #0011240 (see http://public.kitware.com/Bug/view.php?id=11240)
-# Win64+MSVC+static libs = linker error
-if(MSVC AND GIT_ARCH_64 AND NOT BUILD_SHARED_LIBS)
-	set_target_properties(libgit2package PROPERTIES STATIC_LIBRARY_FLAGS "/MACHINE:x64")
-endif()
-
 ide_split_sources(libgit2package)
 
 if(SONAME)
@@ -99,24 +103,54 @@ endif()
 
 # support experimental features and functionality
 
-configure_file(experimental.h.in "${PROJECT_BINARY_DIR}/include/git2/experimental.h")
+configure_file(experimental.h.in "${PROJECT_BINARY_DIR}/gen_headers/experimental.h")
 
-# translate filenames in the git2.h so that they match the install directory
+# translate filenames in the headers so that they match the install directory
 # (allows for side-by-side installs of libgit2 and libgit2-experimental.)
 
-FILE(READ "${PROJECT_SOURCE_DIR}/include/git2.h" LIBGIT2_INCLUDE)
-STRING(REGEX REPLACE "#include \"git2\/" "#include \"${LIBGIT2_FILENAME}/" LIBGIT2_INCLUDE "${LIBGIT2_INCLUDE}")
-FILE(WRITE "${PROJECT_BINARY_DIR}/include/${LIBGIT2_FILENAME}.h" ${LIBGIT2_INCLUDE})
+foreach(HEADER_SOURCE ${SRC_H})
+	file(RELATIVE_PATH HEADER_RELATIVE ${PROJECT_SOURCE_DIR} ${HEADER_SOURCE})
+	string(REGEX REPLACE "^include\/git2" "include/${LIBGIT2_FILENAME}" HEADER_RELATIVE ${HEADER_RELATIVE})
+
+	file(READ "${HEADER_SOURCE}" HEADER_CONTENTS)
+	string(REGEX REPLACE "#include \"git2\/" "#include \"${LIBGIT2_FILENAME}/" HEADER_CONTENTS "${HEADER_CONTENTS}")
+
+	file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/${HEADER_RELATIVE}.tmp" "${HEADER_CONTENTS}")
+	configure_file("${CMAKE_CURRENT_BINARY_DIR}/${HEADER_RELATIVE}.tmp" "${PROJECT_BINARY_DIR}/${HEADER_RELATIVE}" COPYONLY)
+endforeach()
+
+configure_file("${PROJECT_BINARY_DIR}/gen_headers/experimental.h" "${PROJECT_BINARY_DIR}/include/${LIBGIT2_FILENAME}/experimental.h" COPYONLY)
+
+# cmake package targets
+
+set(LIBGIT2_TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets")
+
+write_basic_package_version_file(
+	"${PROJECT_BINARY_DIR}/cmake/${PROJECT_NAME}ConfigVersion.cmake"
+	VERSION ${PROJECT_VERSION}
+	COMPATIBILITY SameMajorVersion)
+
+configure_file(config.cmake.in
+	"${PROJECT_BINARY_DIR}/cmake/${PROJECT_NAME}Config.cmake"
+	@ONLY)
+
+install(FILES
+	"${PROJECT_BINARY_DIR}/cmake/${PROJECT_NAME}Config.cmake"
+	"${PROJECT_BINARY_DIR}/cmake/${PROJECT_NAME}ConfigVersion.cmake"
+	DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
+install(
+	EXPORT ${LIBGIT2_TARGETS_EXPORT_NAME}
+	NAMESPACE "${PROJECT_NAME}::"
+	DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
 
 # Install
 
 install(TARGETS libgit2package
+	EXPORT ${LIBGIT2_TARGETS_EXPORT_NAME}
 	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
 	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/git2/
-        DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${LIBGIT2_FILENAME}")
-install(FILES ${PROJECT_BINARY_DIR}/include/git2/experimental.h
-        DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${LIBGIT2_FILENAME}")
 install(FILES "${PROJECT_BINARY_DIR}/include/${LIBGIT2_FILENAME}.h"
         DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+install(DIRECTORY "${PROJECT_BINARY_DIR}/include/${LIBGIT2_FILENAME}"
+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})

data/vendor/libgit2/src/libgit2/apply.c

@@ -20,6 +20,7 @@
 #include "reader.h"
 #include "index.h"
 #include "repository.h"
+#include "hashmap_str.h"
 #include "apply.h"
 
 typedef struct {
@@ -96,7 +97,7 @@ static void patch_image_free(patch_image *image)
 		return;
 
 	git_pool_clear(&image->pool);
-	git_vector_free(&image->lines);
+	git_vector_dispose(&image->lines);
 }
 
 static bool match_hunk(
@@ -452,7 +453,7 @@ static int apply_one(
 	git_reader *postimage_reader,
 	git_index *postimage,
 	git_diff *diff,
-	git_strmap *removed_paths,
+	git_hashset_str *removed_paths,
 	size_t i,
 	const git_apply_options *opts)
 {
@@ -489,7 +490,7 @@ static int apply_one(
 	 */
 	if (delta->status != GIT_DELTA_RENAMED &&
 	    delta->status != GIT_DELTA_ADDED) {
-		if (git_strmap_exists(removed_paths, delta->old_file.path)) {
+		if (git_hashset_str_contains(removed_paths, delta->old_file.path)) {
 			error = apply_err("path '%s' has been renamed or deleted", delta->old_file.path);
 			goto done;
 		}
@@ -573,11 +574,11 @@ static int apply_one(
 
 	if (delta->status == GIT_DELTA_RENAMED ||
 	    delta->status == GIT_DELTA_DELETED)
-		error = git_strmap_set(removed_paths, delta->old_file.path, (char *) delta->old_file.path);
+		error = git_hashset_str_add(removed_paths, delta->old_file.path);
 
 	if (delta->status == GIT_DELTA_RENAMED ||
 	    delta->status == GIT_DELTA_ADDED)
-		git_strmap_delete(removed_paths, delta->new_file.path);
+		git_hashset_str_remove(removed_paths, delta->new_file.path);
 
 done:
 	git_str_dispose(&pre_contents);
@@ -597,20 +598,17 @@ static int apply_deltas(
 	git_diff *diff,
 	const git_apply_options *opts)
 {
-	git_strmap *removed_paths;
+	git_hashset_str removed_paths = GIT_HASHSET_INIT;
 	size_t i;
 	int error = 0;
 
-	if (git_strmap_new(&removed_paths) < 0)
-		return -1;
-
 	for (i = 0; i < git_diff_num_deltas(diff); i++) {
-		if ((error = apply_one(repo, pre_reader, preimage, post_reader, postimage, diff, removed_paths, i, opts)) < 0)
+		if ((error = apply_one(repo, pre_reader, preimage, post_reader, postimage, diff, &removed_paths, i, opts)) < 0)
 			goto done;
 	}
 
 done:
-	git_strmap_free(removed_paths);
+	git_hashset_str_dispose(&removed_paths);
 	return error;
 }
 
@@ -715,7 +713,6 @@ static int git_apply__to_workdir(
 			goto done;
 	}
 
-	checkout_opts.checkout_strategy |= GIT_CHECKOUT_SAFE;
 	checkout_opts.checkout_strategy |= GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH;
 	checkout_opts.checkout_strategy |= GIT_CHECKOUT_DONT_WRITE_INDEX;
 
@@ -730,7 +727,7 @@ static int git_apply__to_workdir(
 	error = git_checkout_index(repo, postimage, &checkout_opts);
 
 done:
-	git_vector_free(&paths);
+	git_vector_dispose(&paths);
 	return error;
 }