summaryrefslogtreecommitdiff
path: root/builtin/sparse-checkout.c
diff options
context:
space:
mode:
authorDerrick Stolee <dstolee@microsoft.com>2019-11-21 22:04:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-11-22 07:11:43 (GMT)
commitf6039a9423d042d61fb4cfccb395bd04c4bd5322 (patch)
treea985083a89d87ee18cc3d24a736468cdbaa7ff7c /builtin/sparse-checkout.c
parentd89f09c8289a764f0a974e02bd5b38cf60d1a7d7 (diff)
downloadgit-f6039a9423d042d61fb4cfccb395bd04c4bd5322.zip
git-f6039a9423d042d61fb4cfccb395bd04c4bd5322.tar.gz
git-f6039a9423d042d61fb4cfccb395bd04c4bd5322.tar.bz2
sparse-checkout: 'set' subcommand
The 'git sparse-checkout set' subcommand takes a list of patterns as arguments and writes them to the sparse-checkout file. Then, it updates the working directory using 'git read-tree -mu HEAD'. The 'set' subcommand will replace the entire contents of the sparse-checkout file. The write_patterns_and_update() method is extracted from cmd_sparse_checkout() to make it easier to implement 'add' and/or 'remove' subcommands in the future. If the core.sparseCheckout config setting is disabled, then enable the config setting in the worktree config. If we set the config this way and the sparse-checkout fails, then re-disable the config setting. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/sparse-checkout.c')
-rw-r--r--builtin/sparse-checkout.c47
1 files changed, 45 insertions, 2 deletions
diff --git a/builtin/sparse-checkout.c b/builtin/sparse-checkout.c
index e3418fb..95cbd0a 100644
--- a/builtin/sparse-checkout.c
+++ b/builtin/sparse-checkout.c
@@ -8,7 +8,7 @@
#include "strbuf.h"
static char const * const builtin_sparse_checkout_usage[] = {
- N_("git sparse-checkout (init|list)"),
+ N_("git sparse-checkout (init|list|set) <options>"),
NULL
};
@@ -66,7 +66,7 @@ static int update_working_directory(void)
argv_array_pushl(&argv, "read-tree", "-m", "-u", "HEAD", NULL);
if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) {
- error(_("failed to update index with new sparse-checkout paths"));
+ error(_("failed to update index with new sparse-checkout patterns"));
result = 1;
}
@@ -136,6 +136,47 @@ reset_dir:
return update_working_directory();
}
+static int write_patterns_and_update(struct pattern_list *pl)
+{
+ char *sparse_filename;
+ FILE *fp;
+
+ sparse_filename = get_sparse_checkout_filename();
+ fp = fopen(sparse_filename, "w");
+ write_patterns_to_file(fp, pl);
+ fclose(fp);
+ free(sparse_filename);
+
+ return update_working_directory();
+}
+
+static int sparse_checkout_set(int argc, const char **argv, const char *prefix)
+{
+ static const char *empty_base = "";
+ int i;
+ struct pattern_list pl;
+ int result;
+ int changed_config = 0;
+ memset(&pl, 0, sizeof(pl));
+
+ for (i = 1; i < argc; i++)
+ add_pattern(argv[i], empty_base, 0, &pl, 0);
+
+ if (!core_apply_sparse_checkout) {
+ set_config(MODE_ALL_PATTERNS);
+ core_apply_sparse_checkout = 1;
+ changed_config = 1;
+ }
+
+ result = write_patterns_and_update(&pl);
+
+ if (result && changed_config)
+ set_config(MODE_NO_PATTERNS);
+
+ clear_pattern_list(&pl);
+ return result;
+}
+
int cmd_sparse_checkout(int argc, const char **argv, const char *prefix)
{
static struct option builtin_sparse_checkout_options[] = {
@@ -158,6 +199,8 @@ int cmd_sparse_checkout(int argc, const char **argv, const char *prefix)
return sparse_checkout_list(argc, argv);
if (!strcmp(argv[0], "init"))
return sparse_checkout_init(argc, argv);
+ if (!strcmp(argv[0], "set"))
+ return sparse_checkout_set(argc, argv, prefix);
}
usage_with_options(builtin_sparse_checkout_usage,