merge(third_party/git): Merge squashed git subtree at v2.23.0 r/373

Merge commit '1b593e1ea4d2af0f6444d9a7788d5d99abd6fde5' as 'third_party/git'

1 files changed, 34 insertions, 0 deletions

diff --git a/third_party/git/builtin/apply.c b/third_party/git/builtin/apply.c
new file mode 100644
index 000000000000..3f099b960565
--- /dev/null
+++ b/third_party/git/builtin/apply.c
@@ -0,0 +1,34 @@
+#include "cache.h"
+#include "builtin.h"
+#include "parse-options.h"
+#include "lockfile.h"
+#include "apply.h"
+
+static const char * const apply_usage[] = {
+	N_("git apply [<options>] [<patch>...]"),
+	NULL
+};
+
+int cmd_apply(int argc, const char **argv, const char *prefix)
+{
+	int force_apply = 0;
+	int options = 0;
+	int ret;
+	struct apply_state state;
+
+	if (init_apply_state(&state, the_repository, prefix))
+		exit(128);
+
+	argc = apply_parse_options(argc, argv,
+				   &state, &force_apply, &options,
+				   apply_usage);
+
+	if (check_apply_state(&state, force_apply))
+		exit(128);
+
+	ret = apply_all_patches(&state, argc, argv, options);
+
+	clear_apply_state(&state);
+
+	return ret;
+}