{"thread":{"id":"16527","subject":"[PATCH 0/8] Sparse checkout, the last half of the series","startedAt":"2008-11-30T10:54:30Z","lastAt":"2008-12-01T15:39:43Z","messageCount":13,"participants":["Nguyễn Thái Ngọc Duy","Johannes Schindelin","Nguyen Thai Ngoc Duy","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":8},"messages":[{"id":"96771","messageId":"1228042478-1886-1-git-send-email-pclouds@gmail.com","threadId":"16527","inReplyTo":null,"subject":"[PATCH 0/8] Sparse checkout, the last half of the series","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2008-11-30T10:54:30Z","receivedAt":"2008-11-30T10:54:30Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"This series is almost identical to my last sent series with bug fixes.\nDocumentation is hopefully detail enough so I don't have to say more here.\n\nNguyễn Thái Ngọc Duy (8):\n generate-cmdlist.sh: avoid selecting synopsis at wrong place\n Introduce \"sparse patterns\"\n unpack_trees(): keep track of unmerged entries\n unpack_trees(): add support for sparse checkout\n clone: support sparse checkout with --sparse-checkout option\n checkout: add new options to support sparse checkout\n Introduce default sparse patterns (core.defaultsparse)\n wt-status: show sparse checkout info\n\n Documentation/config.txt | 10 +\n Documentation/git-checkout.txt | 133 ++++++++++++++-\n Documentation/git-clone.txt | 11 +-\n Documentation/git-ls-files.txt | 8 +-\n builtin-checkout.c | 93 ++++++++++\n builtin-clone.c | 16 ++\n builtin-ls-files.c | 23 ++-\n builtin-read-tree.c | 3 +-\n cache.h | 5 +\n config.c | 5 +\n environment.c | 1 +\n generate-cmdlist.sh | 2 +-\n t/t2011-checkout-sparse.sh | 147 ++++++++++++++++\n t/t3003-ls-files-narrow-match.sh | 41 +++++\n t/t3003/1 | 4 +\n t/t3003/12 | 8 +\n t/t3003/clone-escape | 5 +\n t/t3003/cur-12 | 2 +\n t/t3003/prefix-sub2 | 3 +\n t/t3003/root-sub-1 | 1 +\n t/t3003/slash-1 | 1 +\n t/t3003/sub-1 | 2 +\n t/t3003/sub-only | 3 +\n t/t3003/subsub-slash | 3 +\n t/t5703-clone-narrow.sh | 42 +++++\n unpack-trees.c | 360 +++++++++++++++++++++++++++++++++++++-\n unpack-trees.h | 29 +++\n wt-status.c | 44 +++++\n wt-status.h | 1 +\n 29 files changed, 988 insertions(+), 18 deletions(-)\n create mode 100755 t/t2011-checkout-sparse.sh\n create mode 100755 t/t3003-ls-files-narrow-match.sh\n create mode 100644 t/t3003/1\n create mode 100644 t/t3003/12\n create mode 100644 t/t3003/clone-escape\n create mode 100644 t/t3003/cur-12\n create mode 100644 t/t3003/prefix-sub2\n create mode 100644 t/t3003/root-sub-1\n create mode 100644 t/t3003/slash-1\n create mode 100644 t/t3003/sub\n create mode 100644 t/t3003/sub-1\n create mode 100644 t/t3003/sub-only\n create mode 100644 t/t3003/subsub-slash\n create mode 100755 t/t5703-clone-narrow.sh\n"},{"id":"96772","messageId":"1228042478-1886-2-git-send-email-pclouds@gmail.com","threadId":"16527","inReplyTo":"1228042478-1886-1-git-send-email-pclouds@gmail.com","subject":"[PATCH 1/8] generate-cmdlist.sh: avoid selecting synopsis at wrong place","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2008-11-30T10:54:31Z","receivedAt":"2008-11-30T10:54:31Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"In \"common\" man pages there is luckily no \"NAME\" anywhere except at\nbeginning of documents. If there is another \"NAME\", sed could\nmis-select it and lead to common-cmds.h corruption. So better nail it\nat beginning of line, which would reduce corruption chance.\n\nSigned-off-by: Nguyễn Thái Ngọc Duy \n---\n generate-cmdlist.sh | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/generate-cmdlist.sh b/generate-cmdlist.sh\nindex a2913c2..75c68d9 100755\n--- a/generate-cmdlist.sh\n+++ b/generate-cmdlist.sh\n@@ -14,7 +14,7 @@ sort |\n while read cmd\n do\n sed -n '\n- /NAME/,/git-'\"$cmd\"'/H\n+ /^NAME/,/git-'\"$cmd\"'/H\n ${\n x\n s/.*git-'\"$cmd\"' - \\(.*\\)/ {\"'\"$cmd\"'\", \"\\1\"},/\n-- \n1.6.0.3.890.g95457\n"},{"id":"96773","messageId":"1228042478-1886-3-git-send-email-pclouds@gmail.com","threadId":"16527","inReplyTo":"1228042478-1886-2-git-send-email-pclouds@gmail.com","subject":"[PATCH 2/8] Introduce \"sparse patterns\"","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2008-11-30T10:54:32Z","receivedAt":"2008-11-30T10:54:32Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"Sparse patterns are basically .gitignore patterns, with the following\nexceptions:\n\n - a leading slash means toplevel working directory\n - ./ will be used if you want to apply \"slash in pattern\" rule,\n similar to leading slash case in .gitignore\n - prefix can be specified in form prefix//pattern\n - patterns are separated by colons\n\n\"git ls-files --narrow-match\" is added to test sparse patterns.\n\nSigned-off-by: Nguyễn Thái Ngọc Duy \n---\n Documentation/git-checkout.txt | 57 +++++++++++++\n Documentation/git-ls-files.txt | 8 ++-\n builtin-ls-files.c | 23 +++++-\n t/t3003-ls-files-narrow-match.sh | 41 +++++++++\n t/t3003/1 | 4 +\n t/t3003/12 | 8 ++\n t/t3003/clone-escape | 5 +\n t/t3003/cur-12 | 2 +\n t/t3003/prefix-sub2 | 3 +\n t/t3003/root-sub-1 | 1 +\n t/t3003/slash-1 | 1 +\n t/t3003/sub-1 | 2 +\n t/t3003/sub-only | 3 +\n t/t3003/subsub-slash | 3 +\n unpack-trees.c | 170 ++++++++++++++++++++++++++++++++++++++\n unpack-trees.h | 20 +++++\n 16 files changed, 347 insertions(+), 4 deletions(-)\n create mode 100755 t/t3003-ls-files-narrow-match.sh\n create mode 100644 t/t3003/1\n create mode 100644 t/t3003/12\n create mode 100644 t/t3003/clone-escape\n create mode 100644 t/t3003/cur-12\n create mode 100644 t/t3003/prefix-sub2\n create mode 100644 t/t3003/root-sub-1\n create mode 100644 t/t3003/slash-1\n create mode 100644 t/t3003/sub\n create mode 100644 t/t3003/sub-1\n create mode 100644 t/t3003/sub-only\n create mode 100644 t/t3003/subsub-slash\n\ndiff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt\nindex ea05a7a..0813d9f 100644\n--- a/Documentation/git-checkout.txt\n+++ b/Documentation/git-checkout.txt\n@@ -205,6 +205,63 @@ is \"assume unchanged\" bit just ignores corresponding files in working\n directory while sparse checkout goes a bit farther, remove those files\n when it is safe to do so.\n \n+Sparse patterns\n+---------------\n+\n+Sparse patterns specify how do you want to form your checkout area.\n+Many patterns can be specified on one line, separated by colons.\n+The patterns specify what files should or should not be checked out\n+on working directory (depends on the option used with the patterns).\n+Patterns have the following format:\n+\n+ - An optional prefix '!' which negates the pattern; any\n+ matching file by a previous pattern will become\n+ unmatched again. If a negated pattern matches, this will\n+ override lower precedence patterns sources.\n+\n+ - If the pattern ends with a slash, it is removed for the\n+ purpose of the following description, but it would only find\n+ a match with a directory. In other words, `foo/` will match a\n+ directory `foo` and paths underneath it, but will not match a\n+ regular file or a symbolic link `foo` (this is consistent\n+ with the way how pathspec works in general in git).\n+\n+ - If the pattern does not contain a slash '/', git treats it as\n+ a shell glob pattern and checks for a match against the\n+ pathname without leading directories.\n+\n+ - If the pattern contains two consecutive slashes '//', git uses\n+ the first part of the pattern before '//' as prefix to apply\n+ the pattern on, and the rest as \"true\" sparse pattern. The\n+ pattern will be only applied if pathname has the same prefix. It\n+ is the same as you apply the pattern with the current directory\n+ being the extracted prefix. Prefix will always be relative to\n+ top-level working directory. This could be used to if you want to\n+ apply the above rule only in a specific subdirectory.\n+\n+ - Otherwise, git treats the pattern as a shell glob suitable\n+ for consumption by fnmatch(3) with the FNM_PATHNAME flag:\n+ wildcards in the pattern will not match a / in the pathname.\n+ For example, \"Documentation/\\*.html\" matches\n+ \"Documentation/git.html\" but not\n+ \"Documentation/ppc/ppc.html\". A leading slash matches the\n+ beginning of the pathname; for example, \"/*.c\" matches\n+ \"cat-file.c\" but not \"mozilla-sha1/sha1.c\".\n+\n+ - Patterns with a leading slash will match against full pathname,\n+ as opposed to normal case when it only matches pathnames relative\n+ to current working directory.\n+\n+ - Patterns begin with \"./\" are treated like normal patterns. That is\n+ it will follow above rules. But since it has a slash inside,\n+ \"fnmatch rule\" will apply. This is a work-around when you do not\n+ want to apply \"no slash\" rule.\n+\n+ - Because colons are used to separate patterns, you cannot put them\n+ in patterns directly. You must quote them using backslash.\n+\n+ - Sparse patterns do not apply to .gitignore and .gitattributes\n+ files. They are always checked out.\n \n EXAMPLES\n --------\ndiff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt\nindex 1de68e2..fbed73b 100644\n--- a/Documentation/git-ls-files.txt\n+++ b/Documentation/git-ls-files.txt\n@@ -12,7 +12,7 @@ SYNOPSIS\n 'git ls-files' [-z] [-t] [-v]\n \t\t(--[cached|deleted|others|ignored|stage|unmerged|killed|modified|orphaned|no-checkout])\\*\n \t\t(-[c|d|o|i|s|u|k|m])\\*\n-\t\t[--sparse]\n+\t\t[--sparse] [--narrow-match=]\n \t\t[-x |--exclude=]\n \t\t[-X |--exclude-from=]\n \t\t[--exclude-per-directory=]\n@@ -90,6 +90,12 @@ OPTIONS\n \tNo-checkout entries can be shown using --orphaned or\n \t--no-checkout (or both).\n \n+--narrow-match=::\n+\tThis option can be used to test sparse patterns. The given sparse patterns will\n+\tbe used to filter ls-files output. Entries not matching the spec will be\n+\tignored. This option can only be used with --cached or --stage.\n+\tSee linkgit:git-checkout[1] for more information about sparse patterns.\n+\n -z::\n \t\\0 line termination on output.\n \ndiff --git a/builtin-ls-files.c b/builtin-ls-files.c\nindex 7606ce1..1b67ae2 100644\n--- a/builtin-ls-files.c\n+++ b/builtin-ls-files.c\n@@ -10,6 +10,8 @@\n #include \"dir.h\"\n #include \"builtin.h\"\n #include \"tree.h\"\n+#include \"tree-walk.h\"\n+#include \"unpack-trees.h\"\n \n static int abbrev;\n static int show_deleted;\n@@ -31,6 +33,7 @@ static const char **pathspec;\n static int error_unmatch;\n static char *ps_matched;\n static const char *with_tree;\n+static struct narrow_spec *narrow_spec;\n \n static const char *tag_cached = \"\";\n static const char *tag_unmerged = \"\";\n@@ -158,7 +161,8 @@ static void show_ce_entry(const char *tag, struct cache_entry *ce)\n \tint len = prefix_len;\n \tint offset = prefix_offset;\n \n-\tif (len >= ce_namelen(ce))\n+\t/* when narrow_spec->full_index is true, the_index is not pruned */\n+\tif (len >= ce_namelen(ce) && (!narrow_spec || !narrow_spec->full_index))\n \t\tdie(\"git ls-files: internal error - cache entry not superset of prefix\");\n \n \tif (pathspec && !pathspec_match(pathspec, ps_matched, ce->name, len))\n@@ -231,6 +235,8 @@ static void show_files(struct dir_struct *dir, const char *prefix)\n \t\t\t}\n \t\t\tif (!(show_cached | show_stage))\n \t\t\t\tcontinue;\n+\t\t\tif (narrow_spec && !match_narrow_spec(narrow_spec, ce->name))\n+\t\t\t\tcontinue;\n \t\t\tshow_ce_entry(ce_stage(ce) ? tag_unmerged : tag_cached, ce);\n \t\t}\n \t}\n@@ -412,7 +418,7 @@ int report_path_error(const char *ps_matched, const char **pathspec, int prefix_\n \n static const char ls_files_usage[] =\n \t\"git ls-files [-z] [-t] [-v] (--[cached|deleted|others|stage|unmerged|killed|modified|orphaned|no-checkout])* \"\n-\t\"[ --sparse ] \"\n+\t\"[ --sparse ] [--narrow-match=] \"\n \t\"[ --ignored ] [--exclude=] [--exclude-from=] \"\n \t\"[ --exclude-per-directory= ] [--exclude-standard] \"\n \t\"[--full-name] [--abbrev] [--] []*\";\n@@ -471,6 +477,10 @@ int cmd_ls_files(int argc, const char **argv, const char *prefix)\n \t\t\tsparse_checkout = 1;\n \t\t\tcontinue;\n \t\t}\n+\t\tif (!prefixcmp(arg, \"--narrow-match=\")) {\n+\t\t\tnarrow_spec = parse_narrow_spec(arg+15, prefix);\n+\t\t\tcontinue;\n+\t\t}\n \t\tif (!strcmp(arg, \"-d\") || !strcmp(arg, \"--deleted\")) {\n \t\t\tshow_deleted = 1;\n \t\t\tcontinue;\n@@ -602,8 +612,14 @@ int cmd_ls_files(int argc, const char **argv, const char *prefix)\n \t show_killed | show_modified | show_orphaned | show_no_checkout))\n \t\tshow_cached = 1;\n \n+\tif (narrow_spec && !show_cached && !show_stage)\n+\t\tdie(\"ls-files: --narrow-match can only be used with either --cached or --stage\");\n+\n+\tif (narrow_spec && narrow_spec->full_index && prefix_offset != 0)\n+\t\tdie(\"ls-files: --narrow-match with root matching patterns requires --full-name\");\n+\n \tread_cache();\n-\tif (prefix)\n+\tif (prefix && (!narrow_spec || !narrow_spec->full_index))\n \t\tprune_cache(prefix);\n \tif (with_tree) {\n \t\t/*\n@@ -625,5 +641,6 @@ int cmd_ls_files(int argc, const char **argv, const char *prefix)\n \t\treturn bad ? 1 : 0;\n \t}\n \n+\tfree_narrow_spec(narrow_spec);\n \treturn 0;\n }\ndiff --git a/t/t3003-ls-files-narrow-match.sh b/t/t3003-ls-files-narrow-match.sh\nnew file mode 100755\nindex 0000000..9879525\n--- /dev/null\n+++ b/t/t3003-ls-files-narrow-match.sh\n@@ -0,0 +1,41 @@\n+#!/bin/sh\n+\n+test_description='This test is for narrow spec matching'\n+\n+. test-lib.sh\n+\n+D=\"$(cd ..;pwd)\"/t3003\n+\n+test_pattern() {\n+\ttest_expect_success \"pattern $1\" '\n+\t\t(\n+\t\tif [ -n \"'$3'\" ]; then cd '$3'; fi\n+\t\tgit ls-files --full-name --narrow-match=\"'\"$2\"'\" > result &&\n+\t\tdiff -u result \"'\"$D/$1\"'\"\n+\t\t)\n+\t'\n+}\n+\n+test_expect_success 'setup' '\n+\ttouch ./1 ./2 ./3 ./\"1:2\" &&\n+\tmkdir -p sub/subsub sub2 &&\n+\ttouch sub/1 sub/2 sub/3 &&\n+\ttouch sub2/1 sub2/2 sub2/3 &&\n+\ttouch sub/subsub/1 sub/subsub/2 sub/subsub/3 &&\n+\tgit add .\n+'\n+\n+test_pattern 1 1\n+test_pattern sub sub\n+test_pattern sub-1 1 sub\n+test_pattern root-sub-1 /1 sub\n+test_pattern subsub-slash subsub/ sub\n+test_pattern sub-only 'sub/:!sub/subsub/'\n+test_pattern 12 1:2\n+test_pattern cur-12 ./1:./2\n+test_pattern slash-1 'sub/*1'\n+test_pattern clone-escape '1\\:2:1'\n+test_pattern prefix-sub2 1:sub2//2 sub\n+\n+test_done\n+\ndiff --git a/t/t3003/1 b/t/t3003/1\nnew file mode 100644\nindex 0000000..4c7381e\n--- /dev/null\n+++ b/t/t3003/1\n@@ -0,0 +1,4 @@\n+1\n+sub/1\n+sub/subsub/1\n+sub2/1\ndiff --git a/t/t3003/12 b/t/t3003/12\nnew file mode 100644\nindex 0000000..0eeb4b8\n--- /dev/null\n+++ b/t/t3003/12\n@@ -0,0 +1,8 @@\n+1\n+2\n+sub/1\n+sub/2\n+sub/subsub/1\n+sub/subsub/2\n+sub2/1\n+sub2/2\ndiff --git a/t/t3003/clone-escape b/t/t3003/clone-escape\nnew file mode 100644\nindex 0000000..31f866e\n--- /dev/null\n+++ b/t/t3003/clone-escape\n@@ -0,0 +1,5 @@\n+1\n+1:2\n+sub/1\n+sub/subsub/1\n+sub2/1\ndiff --git a/t/t3003/cur-12 b/t/t3003/cur-12\nnew file mode 100644\nindex 0000000..1191247\n--- /dev/null\n+++ b/t/t3003/cur-12\n@@ -0,0 +1,2 @@\n+1\n+2\ndiff --git a/t/t3003/prefix-sub2 b/t/t3003/prefix-sub2\nnew file mode 100644\nindex 0000000..27c415c\n--- /dev/null\n+++ b/t/t3003/prefix-sub2\n@@ -0,0 +1,3 @@\n+sub/1\n+sub/subsub/1\n+sub2/2\ndiff --git a/t/t3003/root-sub-1 b/t/t3003/root-sub-1\nnew file mode 100644\nindex 0000000..d00491f\n--- /dev/null\n+++ b/t/t3003/root-sub-1\n@@ -0,0 +1 @@\n+1\ndiff --git a/t/t3003/slash-1 b/t/t3003/slash-1\nnew file mode 100644\nindex 0000000..5798e42\n--- /dev/null\n+++ b/t/t3003/slash-1\n@@ -0,0 +1 @@\n+sub/1\ndiff --git a/t/t3003/sub b/t/t3003/sub\nnew file mode 100644\nindex 0000000..e69de29\ndiff --git a/t/t3003/sub-1 b/t/t3003/sub-1\nnew file mode 100644\nindex 0000000..3ef951a\n--- /dev/null\n+++ b/t/t3003/sub-1\n@@ -0,0 +1,2 @@\n+sub/1\n+sub/subsub/1\ndiff --git a/t/t3003/sub-only b/t/t3003/sub-only\nnew file mode 100644\nindex 0000000..3115212\n--- /dev/null\n+++ b/t/t3003/sub-only\n@@ -0,0 +1,3 @@\n+sub/1\n+sub/2\n+sub/3\ndiff --git a/t/t3003/subsub-slash b/t/t3003/subsub-slash\nnew file mode 100644\nindex 0000000..bc585b0\n--- /dev/null\n+++ b/t/t3003/subsub-slash\n@@ -0,0 +1,3 @@\n+sub/subsub/1\n+sub/subsub/2\n+sub/subsub/3\ndiff --git a/unpack-trees.c b/unpack-trees.c\nindex 54f301d..83888ae 100644\n--- a/unpack-trees.c\n+++ b/unpack-trees.c\n@@ -726,6 +726,176 @@ static void show_stage_entry(FILE *o,\n }\n #endif\n \n+struct narrow_spec *parse_narrow_spec(const char *spec, const char *prefix)\n+{\n+\tstruct narrow_spec *ns;\n+\tstruct narrow_pattern *p;\n+\tconst char *start, *end, *prefix_end;\n+\tint has_wildcards, has_slashes;\n+\n+\tns = xmalloc(sizeof(*ns));\n+\tmemset(ns, 0, sizeof(*ns));\n+\tif (prefix)\n+\t\tns->prefix = xstrdup(prefix);\n+\n+\tstart = spec;\n+\twhile (*start) {\n+\t\tend = start;\n+\t\tprefix_end = NULL;\n+\t\thas_slashes = has_wildcards = 0;\n+\t\twhile (*end && *end != ':') {\n+\t\t\tif (*end == '*' || *end == '[' || *end == '?')\n+\t\t\t\thas_wildcards = 1;\n+\t\t\tif (*end == '/') {\n+\t\t\t\thas_slashes = 1;\n+\n+\t\t\t\t/* A prefix is terminated by double slashes */\n+\t\t\t\tif (end[1] == '/' && !prefix_end) {\n+\t\t\t\t\tprefix_end = end+2;\n+\t\t\t\t\t/* start over again */\n+\t\t\t\t\thas_slashes = has_wildcards = 0;\n+\t\t\t\t}\n+\t\t\t}\n+\t\t\tif (*end == '\\\\') {\n+\t\t\t\tend++;\n+\t\t\t\thas_wildcards = 1;\n+\t\t\t\tif (*end == '\\0') /* trailing backslash */\n+\t\t\t\t\tbreak;\n+\t\t\t}\n+\t\t\tend++;\n+\t\t}\n+\t\t/* empty pattern or pattern with prefix only */\n+\t\tif (start == end || prefix_end == end)\n+\t\t\tgoto cont;\n+\n+\t\tp = xmalloc(sizeof(*p));\n+\t\tmemset(p, 0, sizeof(*p));\n+\t\tif (prefix_end) {\n+\t\t\tint len = prefix_end - start - 1; /* only take one slash */\n+\t\t\tp->prefix = xmalloc(len + 1);\n+\t\t\tmemcpy(p->prefix, start, len);\n+\t\t\tp->prefix[len] = '\\0';\n+\t\t\tstart = prefix_end;\n+\t\t}\n+\t\tif (*start == '!') {\n+\t\t\tp->negative = 1;\n+\t\t\tstart++;\n+\t\t}\n+\t\tp->has_slashes = has_slashes;\n+\t\tp->has_wildcards = has_wildcards;\n+\t\tp->has_trailing_slash = end[-1] == '/';\n+\t\tif (*start == '/') {\n+\t\t\tp->has_root = 1;\n+\t\t\tstart++;\n+\t\t}\n+\t\telse if (*start == '.' && start[1] == '/')\n+\t\t\tstart += 2;\n+\t\tp->len = end-start;\n+\t\tp->pattern = xmalloc(p->len+1);\n+\t\tmemcpy(p->pattern, start, p->len);\n+\t\tp->pattern[p->len] = '\\0';\n+\n+\t\tALLOC_GROW(ns->patterns, ns->nr + 1, ns->alloc);\n+\t\tns->patterns[ns->nr++] = p;\n+\n+\t\t/*\n+\t\t * ls-files needs to know whether it can prune the index\n+\t\t * in these cases, index cannot be pruned\n+\t\t */\n+\t\tif (p->has_root || p->prefix)\n+\t\t\tns->full_index = 1;\n+\n+cont:\n+\t\tif (*end != ':')\n+\t\t\tbreak;\n+\t\tstart = end + 1;\n+\t}\n+\treturn ns;\n+}\n+\n+void free_narrow_spec(struct narrow_spec *spec)\n+{\n+\tint i;\n+\tif (!spec)\n+\t\treturn;\n+\tfor (i = 0; i < spec->nr; i++) {\n+\t\tstruct narrow_pattern *p = spec->patterns[i];\n+\t\tif (p->prefix)\n+\t\t\tfree(p->prefix);\n+\t\tif (p->pattern)\n+\t\t\tfree(p->pattern);\n+\t\tfree(p);\n+\t}\n+\tif (spec->patterns)\n+\t\tfree(spec->patterns);\n+\tif (spec->prefix)\n+\t\tfree(spec->prefix);\n+\tfree(spec);\n+}\n+\n+int match_narrow_spec(struct narrow_spec *spec, const char *path)\n+{\n+\tint i, match;\n+\n+\tif (!spec)\n+\t\treturn 1; /* always match if spec is NULL */\n+\n+\tfor (i = spec->nr - 1;i >= 0; i--) {\n+\t\tstruct narrow_pattern\t*p\t = spec->patterns[i];\n+\t\tconst char\t\t*prefix\t = p->prefix ? p->prefix : spec->prefix;\n+\t\tint\t\t\t prefix_len = prefix ? strlen(prefix) : 0;\n+\t\tconst char\t\t*new_path = p->has_root ? path : path + prefix_len;\n+\n+\t\tif (!p->has_root && prefix && prefixcmp(path, prefix))\n+\t\t\tcontinue;\n+\n+\t\tif (p->has_trailing_slash) {\n+\t\t\t/* the only \"wildcard\" here is backslash escape */\n+\t\t\tif (p->has_wildcards) {\n+\t\t\t\tchar *unescaped_pattern = xstrdup(p->pattern);\n+\t\t\t\tchar *src, *dst;\n+\n+\t\t\t\tsrc = dst = unescaped_pattern;\n+\t\t\t\twhile (*src) {\n+\t\t\t\t\tif (*src == '\\\\')\n+\t\t\t\t\t\tsrc++;\n+\t\t\t\t\tif (src != dst)\n+\t\t\t\t\t\t*dst = *src;\n+\t\t\t\t\tsrc++;\n+\t\t\t\t\tdst++;\n+\t\t\t\t}\n+\t\t\t\t*dst = '\\0';\n+\t\t\t\tmatch = prefixcmp(new_path, unescaped_pattern) == 0;\n+\t\t\t\tfree(unescaped_pattern);\n+\t\t\t}\n+\t\t\telse\n+\t\t\t\tmatch = prefixcmp(new_path, p->pattern) == 0;\n+\t\t}\n+\t\telse if (p->has_slashes) {\n+\t\t\tif (p->has_wildcards)\n+\t\t\t\tmatch = fnmatch(p->pattern, new_path, FNM_PATHNAME) == 0;\n+\t\t\telse\n+\t\t\t\tmatch = strcmp(p->pattern, new_path) == 0;\n+\t\t}\n+\t\telse {\n+\t\t\tconst char *basename = strrchr(path + prefix_len, '/');\n+\t\t\tif (basename)\n+\t\t\t\tbasename++;\n+\t\t\telse\n+\t\t\t\tbasename = path + prefix_len;\n+\t\t\tif (p->has_wildcards)\n+\t\t\t\tmatch = fnmatch(p->pattern, basename, 0) == 0;\n+\t\t\telse\n+\t\t\t\tmatch = strcmp(p->pattern, basename) == 0;\n+\t\t}\n+\t\tif (match)\n+\t\t\treturn p->negative ? 0 : 1;\n+\t}\n+\n+\t/* no pattern is matched */\n+\treturn 0;\n+}\n+\n int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o)\n {\n \tstruct cache_entry *index;\ndiff --git a/unpack-trees.h b/unpack-trees.h\nindex 0d26f3d..93ec3c6 100644\n--- a/unpack-trees.h\n+++ b/unpack-trees.h\n@@ -16,6 +16,23 @@ struct unpack_trees_error_msgs {\n \tconst char *bind_overlap;\n };\n \n+struct narrow_spec {\n+\tint nr;\n+\tint alloc;\n+\tint full_index;\n+\tchar *prefix;\n+\tstruct narrow_pattern {\n+\t\tint len;\n+\t\tint has_root:1;\n+\t\tint has_slashes:1;\n+\t\tint has_wildcards:1;\n+\t\tint has_trailing_slash:1;\n+\t\tint negative:1;\n+\t\tchar *pattern;\n+\t\tchar *prefix;\n+\t} **patterns;\n+};\n+\n struct unpack_trees_options {\n \tunsigned int reset:1,\n \t\t merge:1,\n@@ -48,6 +65,9 @@ struct unpack_trees_options {\n extern int unpack_trees(unsigned n, struct tree_desc *t,\n \t\tstruct unpack_trees_options *options);\n \n+struct narrow_spec *parse_narrow_spec(const char *spec, const char *prefix);\n+void free_narrow_spec(struct narrow_spec *spec);\n+int match_narrow_spec(struct narrow_spec *spec, const char *path);\n int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o);\n int twoway_merge(struct cache_entry **src, struct unpack_trees_options *o);\n int bind_merge(struct cache_entry **src, struct unpack_trees_options *o);\n-- \n1.6.0.3.890.g95457\n"},{"id":"96774","messageId":"1228042478-1886-4-git-send-email-pclouds@gmail.com","threadId":"16527","inReplyTo":"1228042478-1886-3-git-send-email-pclouds@gmail.com","subject":"[PATCH 3/8] unpack_trees(): keep track of unmerged entries","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2008-11-30T10:54:33Z","receivedAt":"2008-11-30T10:54:33Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"\"git read-tree --reset\" will currently remove all unmerged entries in\nindex before feeding the index to unpack_trees(). Because the lack of\nunmerged entries, these entries, when read from tree, will be seen as\n\"new entries\" by {one,two,three}way_merge().\n\nThis is fine for now. But for sparse checkout, it needs to know\nwhether an entry is new entry, because it will handle it different way\nthan already-in entry.\n\nSo the patch moves \"unmerged entries removal\" part into\nunpack_trees(), actually unpack_callback(). The function then can turn\non o->has_unmerged flag, which can be utilized by sparse checkout.\n\nSigned-off-by: Nguyễn Thái Ngọc Duy \n---\n builtin-read-tree.c | 3 ++-\n unpack-trees.c | 7 +++++++\n unpack-trees.h | 2 ++\n 3 files changed, 11 insertions(+), 1 deletions(-)\n\ndiff --git a/builtin-read-tree.c b/builtin-read-tree.c\nindex 38fef34..528134c 100644\n--- a/builtin-read-tree.c\n+++ b/builtin-read-tree.c\n@@ -136,9 +136,10 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)\n \t\t\tif (stage || opts.merge || opts.prefix)\n \t\t\t\tusage(read_tree_usage);\n \t\t\topts.reset = 1;\n+\t\t\topts.prune_unmerged = 1;\n \t\t\topts.merge = 1;\n \t\t\tstage = 1;\n-\t\t\tread_cache_unmerged();\n+\t\t\tread_cache();\n \t\t\tcontinue;\n \t\t}\n \ndiff --git a/unpack-trees.c b/unpack-trees.c\nindex 83888ae..7d99051 100644\n--- a/unpack-trees.c\n+++ b/unpack-trees.c\n@@ -301,6 +301,7 @@ static int unpack_callback(int n, unsigned long mask, unsigned long dirmask, str\n \n \t/* Are we supposed to look at the index too? */\n \tif (o->merge) {\n+\t\to->has_unmerged = 0;\n \t\twhile (o->pos < o->src_index->cache_nr) {\n \t\t\tstruct cache_entry *ce = o->src_index->cache[o->pos];\n \t\t\tint cmp = compare_entry(ce, info, p);\n@@ -320,6 +321,12 @@ static int unpack_callback(int n, unsigned long mask, unsigned long dirmask, str\n \t\t\t\t\t\tadd_entry(o, ce, 0, 0);\n \t\t\t\t\t\treturn mask;\n \t\t\t\t\t}\n+\n+\t\t\t\t\tif (o->prune_unmerged) {\n+\t\t\t\t\t\to->has_unmerged = 1;\n+\t\t\t\t\t\t/* leave src[0] as NULL and go over all other staged entries */\n+\t\t\t\t\t\tcontinue;\n+\t\t\t\t\t}\n \t\t\t\t}\n \t\t\t\tsrc[0] = ce;\n \t\t\t}\ndiff --git a/unpack-trees.h b/unpack-trees.h\nindex 93ec3c6..86f0989 100644\n--- a/unpack-trees.h\n+++ b/unpack-trees.h\n@@ -43,6 +43,8 @@ struct unpack_trees_options {\n \t\t verbose_update:1,\n \t\t aggressive:1,\n \t\t skip_unmerged:1,\n+\t\t prune_unmerged:1,\n+\t\t has_unmerged:1,\n \t\t initial_checkout:1,\n \t\t gently:1;\n \tconst char *prefix;\n-- \n1.6.0.3.890.g95457\n"},{"id":"96775","messageId":"1228042478-1886-5-git-send-email-pclouds@gmail.com","threadId":"16527","inReplyTo":"1228042478-1886-4-git-send-email-pclouds@gmail.com","subject":"[PATCH 4/8] unpack_trees(): add support for sparse checkout","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2008-11-30T10:54:34Z","receivedAt":"2008-11-30T10:54:34Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"This patch teaches unpack_trees() to checkout/remove entries\non working directories appropriately when sparse checkout area is\nchanged. There are three kind of changes:\n\n - new_narrow_path: reset workdir to a completely new checkout area\n - add_narrow_path: keep current areas and add more entries\n - remove_narrow_path: remove some entries from current areas\n\nWhen unpack_trees() is called without any of those options, changes in\nno-checkout entries will not get checked out on working directory. New\nfiles still appear on working directory though. That will be handled\nlater by core.defaultsparse\n\nCE_WD_REMOVE is introduced to remove entries from working directories,\nbut still keep them in index\n\nSigned-off-by: Nguyễn Thái Ngọc Duy \n---\n cache.h | 3 +\n unpack-trees.c | 131 +++++++++++++++++++++++++++++++++++++++++++++++++++++---\n unpack-trees.h | 6 +++\n 3 files changed, 134 insertions(+), 6 deletions(-)\n\ndiff --git a/cache.h b/cache.h\nindex 321fc54..b13df06 100644\n--- a/cache.h\n+++ b/cache.h\n@@ -173,6 +173,9 @@ struct cache_entry {\n #define CE_HASHED (0x100000)\n #define CE_UNHASHED (0x200000)\n \n+/* Only remove in work directory, not index */\n+#define CE_WT_REMOVE (0x400000)\n+\n /*\n * Extended on-disk flags\n */\ndiff --git a/unpack-trees.c b/unpack-trees.c\nindex 7d99051..a2794b8 100644\n--- a/unpack-trees.c\n+++ b/unpack-trees.c\n@@ -31,6 +31,12 @@ static struct unpack_trees_error_msgs unpack_plumbing_errors = {\n \n \t/* bind_overlap */\n \t\"Entry '%s' overlaps with '%s'. Cannot bind.\",\n+\n+\t/* sparse_not_uptodate_file */\n+\t\"Entry '%s' not uptodate. Cannot update sparse checkout.\",\n+\n+\t/* would_lose_orphaned */\n+\t\"Orphaned working tree file '%s' would be %s by sparse checkout update.\",\n };\n \n #define ERRORMSG(o,fld) \\\n@@ -96,7 +102,7 @@ static int check_updates(struct unpack_trees_options *o)\n \tif (o->update && o->verbose_update) {\n \t\tfor (total = cnt = 0; cnt < index->cache_nr; cnt++) {\n \t\t\tstruct cache_entry *ce = index->cache[cnt];\n-\t\t\tif (ce->ce_flags & (CE_UPDATE | CE_REMOVE))\n+\t\t\tif (ce->ce_flags & (CE_UPDATE | CE_REMOVE | CE_WT_REMOVE))\n \t\t\t\ttotal++;\n \t\t}\n \n@@ -108,6 +114,13 @@ static int check_updates(struct unpack_trees_options *o)\n \tfor (i = 0; i < index->cache_nr; i++) {\n \t\tstruct cache_entry *ce = index->cache[i];\n \n+\t\tif (ce->ce_flags & CE_WT_REMOVE) {\n+\t\t\tdisplay_progress(progress, ++cnt);\n+\t\t\tif (o->update)\n+\t\t\t\tunlink_entry(ce);\n+\t\t\tcontinue;\n+\t\t}\n+\n \t\tif (ce->ce_flags & CE_REMOVE) {\n \t\t\tdisplay_progress(progress, ++cnt);\n \t\t\tif (o->update)\n@@ -133,6 +146,82 @@ static int check_updates(struct unpack_trees_options *o)\n \treturn errs != 0;\n }\n \n+static int verify_uptodate_sparse(struct cache_entry *ce, struct unpack_trees_options *o);\n+static int verify_absent_sparse(struct cache_entry *ce, const char *action, struct unpack_trees_options *o);\n+static int apply_narrow_spec(struct unpack_trees_options *o)\n+{\n+\tstruct index_state *index = &o->result;\n+\tint i, len, namelen;\n+\tint header = 0;\n+\tchar *special_files[] = { \".gitignore\", GITATTRIBUTES_FILE, NULL };\n+\tchar **special_file;\n+\n+\tfor (i = 0; i < index->cache_nr; i++) {\n+\t\tstruct cache_entry *ce = index->cache[i];\n+\t\tint was_checkout = ce_checkout(ce);\n+\n+\t\tif (ce_stage(ce))\n+\t\t\tcontinue;\n+\n+\t\t/* Special case: .gitignore and .gitattributes should stay */\n+\t\tfor (special_file = special_files; *special_file; special_file++) {\n+\t\t\tlen = strlen(*special_file);\n+\t\t\tnamelen = ce_namelen(ce);\n+\t\t\tif ((namelen == len ||\n+\t\t\t (namelen > len && ce->name[namelen-len-1] == '/')) &&\n+\t\t\t !strcmp(ce->name+namelen-len, *special_file))\n+\t\t\t\tbreak;\n+\t\t}\n+\t\tif (*special_file)\n+\t\t\tcontinue;\n+\n+\t\tif (o->new_narrow_path | o->add_narrow_path | o->remove_narrow_path) {\n+\t\t\tint match = match_narrow_spec(o->narrow_spec, ce->name);\n+\t\t\tif (o->new_narrow_path) {\n+\t\t\t\tif (match)\n+\t\t\t\t\tce_mark_checkout(ce);\n+\t\t\t\telse\n+\t\t\t\t\tce_mark_no_checkout(ce);\n+\t\t\t}\n+\t\t\tif (o->add_narrow_path && match)\n+\t\t\t\tce_mark_checkout(ce);\n+\t\t\tif (o->remove_narrow_path && match)\n+\t\t\t\tce_mark_no_checkout(ce);\n+\t\t}\n+\n+\t\t/* Update worktree, add/remove entries if needed */\n+\n+\t\t/*\n+\t\t * We only care about files getting into the checkout area\n+\t\t * If merge strategies want to remove some, go ahead\n+\t\t */\n+\t\tif (ce->ce_flags & CE_REMOVE)\n+\t\t\tcontinue;\n+\n+\t\tif (was_checkout && ce_no_checkout(ce)) {\n+\t\t\t/*\n+\t\t\t * If CE_UPDATE is set, verify_uptodate() must be called already\n+\t\t\t * also stat info may have lost after merged_entry() so calling\n+\t\t\t * verify_uptodate() again may fail\n+\t\t\t */\n+\t\t\tif (!(ce->ce_flags & CE_UPDATE) && verify_uptodate_sparse(ce, o))\n+\t\t\t\treturn -1;\n+\t\t\tce->ce_flags |= CE_WT_REMOVE;\n+\t\t}\n+\t\tif (!was_checkout && ce_checkout(ce)) {\n+\t\t\tif (verify_absent_sparse(ce, \"overwritten\", o))\n+\t\t\t\treturn -1;\n+\t\t\tce->ce_flags |= CE_UPDATE;\n+\t\t}\n+\n+\t\t/* merge strategies may set CE_UPDATE outside checkout area */\n+\t\tif (ce_no_checkout(ce))\n+\t\t\tce->ce_flags &= ~CE_UPDATE;\n+\n+\t}\n+\treturn 0;\n+}\n+\n static inline int call_unpack_fn(struct cache_entry **src, struct unpack_trees_options *o)\n {\n \tint ret = o->fn(src, o);\n@@ -416,6 +505,9 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options\n \tif (o->trivial_merges_only && o->nontrivial_merge)\n \t\treturn unpack_failed(o, \"Merge requires file-level merging\");\n \n+\tif (apply_narrow_spec(o))\n+\t\treturn unpack_failed(o, NULL);\n+\n \to->src_index = NULL;\n \tret = check_updates(o) ? (-2) : 0;\n \tif (o->dst_index)\n@@ -445,8 +537,9 @@ static int same(struct cache_entry *a, struct cache_entry *b)\n * When a CE gets turned into an unmerged entry, we\n * want it to be up-to-date\n */\n-static int verify_uptodate(struct cache_entry *ce,\n-\t\tstruct unpack_trees_options *o)\n+static int verify_uptodate_generic(struct cache_entry *ce,\n+\t\t\t\t struct unpack_trees_options *o,\n+\t\t\t\t const char *error_msg)\n {\n \tstruct stat st;\n \n@@ -471,7 +564,18 @@ static int verify_uptodate(struct cache_entry *ce,\n \tif (errno == ENOENT)\n \t\treturn 0;\n \treturn o->gently ? -1 :\n-\t\terror(ERRORMSG(o, not_uptodate_file), ce->name);\n+\t\terror(error_msg, ce->name);\n+}\n+\n+static int verify_uptodate(struct cache_entry *ce,\n+\t\t\t struct unpack_trees_options *o)\n+{\n+\treturn verify_uptodate_generic(ce, o, ERRORMSG(o, not_uptodate_file));\n+}\n+static int verify_uptodate_sparse(struct cache_entry *ce,\n+\t\t\t\t struct unpack_trees_options *o)\n+{\n+\treturn verify_uptodate_generic(ce, o, ERRORMSG(o, sparse_not_uptodate_file));\n }\n \n static void invalidate_ce_path(struct cache_entry *ce, struct unpack_trees_options *o)\n@@ -583,8 +687,9 @@ static int icase_exists(struct unpack_trees_options *o, struct cache_entry *dst,\n * We do not want to remove or overwrite a working tree file that\n * is not tracked, unless it is ignored.\n */\n-static int verify_absent(struct cache_entry *ce, const char *action,\n-\t\t\t struct unpack_trees_options *o)\n+static int verify_absent_generic(struct cache_entry *ce, const char *action,\n+\t\t\t\t struct unpack_trees_options *o,\n+\t\t\t\t const char *error_msg)\n {\n \tstruct stat st;\n \n@@ -662,6 +767,16 @@ static int verify_absent(struct cache_entry *ce, const char *action,\n \t}\n \treturn 0;\n }\n+static int verify_absent(struct cache_entry *ce, const char *action,\n+\t\t\t struct unpack_trees_options *o)\n+{\n+\treturn verify_absent_generic(ce, action, o, ERRORMSG(o, would_lose_untracked));\n+}\n+static int verify_absent_sparse(struct cache_entry *ce, const char *action,\n+\t\t\t struct unpack_trees_options *o)\n+{\n+\treturn verify_absent_generic(ce, action, o, ERRORMSG(o, would_lose_orphaned));\n+}\n \n static int merged_entry(struct cache_entry *merge, struct cache_entry *old,\n \t\tstruct unpack_trees_options *o)\n@@ -684,6 +799,8 @@ static int merged_entry(struct cache_entry *merge, struct cache_entry *old,\n \t\t\t\treturn -1;\n \t\t\tinvalidate_ce_path(old, o);\n \t\t}\n+\t\tif (ce_no_checkout(old))\n+\t\t\tupdate |= CE_NO_CHECKOUT;\n \t}\n \telse {\n \t\tif (verify_absent(merge, \"overwritten\", o))\n@@ -1182,6 +1299,8 @@ int oneway_merge(struct cache_entry **src, struct unpack_trees_options *o)\n \t\t\t ie_match_stat(o->src_index, old, &st, CE_MATCH_IGNORE_VALID))\n \t\t\t\tupdate |= CE_UPDATE;\n \t\t}\n+\t\tif (ce_no_checkout(old))\n+\t\t\tupdate |= CE_NO_CHECKOUT;\n \t\tadd_entry(o, old, update, 0);\n \t\treturn 0;\n \t}\ndiff --git a/unpack-trees.h b/unpack-trees.h\nindex 86f0989..7e9febd 100644\n--- a/unpack-trees.h\n+++ b/unpack-trees.h\n@@ -14,6 +14,8 @@ struct unpack_trees_error_msgs {\n \tconst char *not_uptodate_dir;\n \tconst char *would_lose_untracked;\n \tconst char *bind_overlap;\n+\tconst char *sparse_not_uptodate_file;\n+\tconst char *would_lose_orphaned;\n };\n \n struct narrow_spec {\n@@ -46,6 +48,9 @@ struct unpack_trees_options {\n \t\t prune_unmerged:1,\n \t\t has_unmerged:1,\n \t\t initial_checkout:1,\n+\t\t new_narrow_path:1,\n+\t\t add_narrow_path:2,\n+\t\t remove_narrow_path:2,\n \t\t gently:1;\n \tconst char *prefix;\n \tint pos;\n@@ -57,6 +62,7 @@ struct unpack_trees_options {\n \tint merge_size;\n \n \tstruct cache_entry *df_conflict_entry;\n+\tstruct narrow_spec *narrow_spec;\n \tvoid *unpack_data;\n \n \tstruct index_state *dst_index;\n-- \n1.6.0.3.890.g95457\n"},{"id":"96776","messageId":"1228042478-1886-6-git-send-email-pclouds@gmail.com","threadId":"16527","inReplyTo":"1228042478-1886-5-git-send-email-pclouds@gmail.com","subject":"[PATCH 5/8] clone: support sparse checkout with --sparse-checkout option","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2008-11-30T10:54:35Z","receivedAt":"2008-11-30T10:54:35Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"\nSigned-off-by: Nguyễn Thái Ngọc Duy \n---\n Documentation/git-clone.txt | 10 +++++++++-\n builtin-clone.c | 14 ++++++++++++++\n t/t5703-clone-narrow.sh | 41 +++++++++++++++++++++++++++++++++++++++++\n 3 files changed, 64 insertions(+), 1 deletions(-)\n create mode 100755 t/t5703-clone-narrow.sh\n\ndiff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt\nindex 95f08b9..acdced2 100644\n--- a/Documentation/git-clone.txt\n+++ b/Documentation/git-clone.txt\n@@ -12,7 +12,8 @@ SYNOPSIS\n 'git clone' [--template=]\n \t [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [--mirror]\n \t [-o ] [-u ] [--reference ]\n-\t [--depth ] [--] []\n+\t [--depth ] [-S|--sparse-checkout=] [--]\n+\t []\n \n DESCRIPTION\n -----------\n@@ -99,6 +100,13 @@ then the cloned repository will become corrupt.\n -n::\n \tNo checkout of HEAD is performed after the clone is complete.\n \n+-S=::\n+--sparse-checkout=::\n+\tMake a sparse checkout instead of a full one.\n+\tThis option will not work with either --no-checkout or --bare.\n+\tPlease refer to linkgit:git-checkout[1] for more detail on\n+\tsparse checkout and sparse patterns.\n+\n --bare::\n \tMake a 'bare' GIT repository. That is, instead of\n \tcreating `` and placing the administrative\ndiff --git a/builtin-clone.c b/builtin-clone.c\nindex 2feac9c..ea341a1 100644\n--- a/builtin-clone.c\n+++ b/builtin-clone.c\n@@ -36,6 +36,7 @@ static const char * const builtin_clone_usage[] = {\n static int option_quiet, option_no_checkout, option_bare, option_mirror;\n static int option_local, option_no_hardlinks, option_shared;\n static char *option_template, *option_reference, *option_depth;\n+static char *option_narrow_path;\n static char *option_origin = NULL;\n static char *option_upload_pack = \"git-upload-pack\";\n static int option_verbose;\n@@ -45,6 +46,8 @@ static struct option builtin_clone_options[] = {\n \tOPT__VERBOSE(&option_verbose),\n \tOPT_BOOLEAN('n', \"no-checkout\", &option_no_checkout,\n \t\t \"don't create a checkout\"),\n+\tOPT_STRING('S', \"sparse-checkout\", &option_narrow_path, \"sparse patterns\",\n+\t\t \"only checkout certain files based on patterns\"),\n \tOPT_BOOLEAN(0, \"bare\", &option_bare, \"create a bare repository\"),\n \tOPT_BOOLEAN(0, \"naked\", &option_bare, \"create a bare repository\"),\n \tOPT_BOOLEAN(0, \"mirror\", &option_mirror,\n@@ -383,10 +386,15 @@ int cmd_clone(int argc, const char **argv, const char *prefix)\n \t\tif (option_origin)\n \t\t\tdie(\"--bare and --origin %s options are incompatible.\",\n \t\t\t option_origin);\n+\t\tif (option_narrow_path)\n+\t\t\tdie(\"--bare and --sparse-checkout options are incompatible.\");\n \t\toption_no_checkout = 1;\n \t\tuse_separate_remote = 0;\n \t}\n \n+\tif (option_no_checkout && option_narrow_path)\n+\t\tdie(\"--no-checkout and --sparse-checkout options are incompatible.\");\n+\n \tif (!option_origin)\n \t\toption_origin = \"origin\";\n \n@@ -597,10 +605,16 @@ int cmd_clone(int argc, const char **argv, const char *prefix)\n \t\topts.src_index = &the_index;\n \t\topts.dst_index = &the_index;\n \n+\t\tif (option_narrow_path) {\n+\t\t\topts.new_narrow_path = 1;\n+\t\t\topts.narrow_spec = parse_narrow_spec(option_narrow_path, NULL);\n+\t\t}\n+\n \t\ttree = parse_tree_indirect(remote_head->old_sha1);\n \t\tparse_tree(tree);\n \t\tinit_tree_desc(&t, tree->buffer, tree->size);\n \t\tunpack_trees(1, &t, &opts);\n+\t\tfree_narrow_spec(opts.narrow_spec);\n \n \t\tif (write_cache(fd, active_cache, active_nr) ||\n \t\t commit_locked_index(lock_file))\ndiff --git a/t/t5703-clone-narrow.sh b/t/t5703-clone-narrow.sh\nnew file mode 100755\nindex 0000000..e34246d\n--- /dev/null\n+++ b/t/t5703-clone-narrow.sh\n@@ -0,0 +1,41 @@\n+#!/bin/sh\n+\n+test_description='narrow clone'\n+\n+. ./test-lib.sh\n+\n+test_expect_success setup '\n+\trm -fr .git &&\n+\ttest_create_repo src &&\n+\t(\n+\t\tcd src\n+\t\tmkdir -p work/sub/dir\n+\t\ttouch untracked tracked modified added\n+\t\ttouch work/untracked work/tracked work/modified work/added\n+\t\tgit add tracked work/tracked\n+\t\tgit add modified work/modified\n+\t\tgit commit -m initial\n+\t)\n+\n+'\n+\n+test_expect_success 'narrow clone incompatible with --bare' '\n+\trm -fr dst &&\n+\ttest_must_fail git clone --sparse-checkout=work/ --bare src dst\n+'\n+\n+test_expect_success 'narrow clone incompatible with --no-checkout' '\n+\trm -fr dst &&\n+\ttest_must_fail git clone --sparse-checkout=work/ -n src dst\n+'\n+\n+test_expect_success 'clone with --sparse-checkout' '\n+\t(\n+\trm -fr dst &&\n+\tgit clone --sparse-checkout=work/ src dst &&\n+\tcd dst &&\n+\ttest -z \"$(git ls-files --sparse | grep -v ^work/)\"\n+\t)\n+'\n+\n+test_done\n-- \n1.6.0.3.890.g95457\n"},{"id":"96777","messageId":"1228042478-1886-7-git-send-email-pclouds@gmail.com","threadId":"16527","inReplyTo":"1228042478-1886-6-git-send-email-pclouds@gmail.com","subject":"[PATCH 6/8] checkout: add new options to support sparse checkout","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2008-11-30T10:54:36Z","receivedAt":"2008-11-30T10:54:36Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"This patch adds main interface to manipulate sparse checkout.\nNew options are added to support entering/updating/leaving sparse\ncheckout:\n\n --full: return to full checkout (default)\n --sparse: set checkout area according to given spec\n --{include,exclude}-sparse: adjust current sparse checkout area\n\nSigned-off-by: Nguyễn Thái Ngọc Duy \n---\n Documentation/git-checkout.txt | 55 ++++++++++++++++-\n builtin-checkout.c | 39 ++++++++++++\n t/t2011-checkout-sparse.sh | 128 ++++++++++++++++++++++++++++++++++++++++\n 3 files changed, 219 insertions(+), 3 deletions(-)\n create mode 100755 t/t2011-checkout-sparse.sh\n\ndiff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt\nindex 0813d9f..b32043f 100644\n--- a/Documentation/git-checkout.txt\n+++ b/Documentation/git-checkout.txt\n@@ -8,8 +8,10 @@ git-checkout - Checkout a branch or paths to the working tree\n SYNOPSIS\n --------\n [verse]\n-'git checkout' [-q] [-f] [--track | --no-track] [-b [-l]] [-m] []\n-'git checkout' [-f|--ours|--theirs|-m|--conflict=