From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 25 Dec 2019 19:21:58 +0000 (-0800)
Subject: Merge branch 'ds/sparse-cone'
X-Git-Tag: v2.25.0-rc0~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd72a08d6ce451e7d4725d6b3b411d482333e5cb;p=thirdparty%2Fgit.git

Merge branch 'ds/sparse-cone'

Management of sparsely checked-out working tree has gained a
dedicated "sparse-checkout" command.

* ds/sparse-cone: (21 commits)
  sparse-checkout: improve OS ls compatibility
  sparse-checkout: respect core.ignoreCase in cone mode
  sparse-checkout: check for dirty status
  sparse-checkout: update working directory in-process for 'init'
  sparse-checkout: cone mode should not interact with .gitignore
  sparse-checkout: write using lockfile
  sparse-checkout: use in-process update for disable subcommand
  sparse-checkout: update working directory in-process
  sparse-checkout: sanitize for nested folders
  unpack-trees: add progress to clear_ce_flags()
  unpack-trees: hash less in cone mode
  sparse-checkout: init and set in cone mode
  sparse-checkout: use hashmaps for cone patterns
  sparse-checkout: add 'cone' mode
  trace2: add region in clear_ce_flags
  sparse-checkout: create 'disable' subcommand
  sparse-checkout: add '--stdin' option to set subcommand
  sparse-checkout: 'set' subcommand
  clone: add --sparse mode
  sparse-checkout: create 'init' subcommand
  ...
---

bd72a08d6ce451e7d4725d6b3b411d482333e5cb
diff --cc dir.h
index c575f941dc,77a43dbf89..5855c065a6
--- a/dir.h
+++ b/dir.h
@@@ -1,44 -1,12 +1,45 @@@
  #ifndef DIR_H
  #define DIR_H
  
 -/* See Documentation/technical/api-directory-listing.txt */
 -
  #include "cache.h"
+ #include "hashmap.h"
  #include "strbuf.h"
  
 +/**
 + * The directory listing API is used to enumerate paths in the work tree,
 + * optionally taking `.git/info/exclude` and `.gitignore` files per directory
 + * into account.
 + */
 +
 +/**
 + * Calling sequence
 + * ----------------
 + *
 + * Note: The index may be checked for .gitignore files that are
 + * CE_SKIP_WORKTREE marked. If you want to exclude files, make sure you have
 + * loaded the index first.
 + *
 + * - Prepare `struct dir_struct dir` and clear it with `memset(&dir, 0,
 + * sizeof(dir))`.
 + *
 + * - To add single exclude pattern, call `add_pattern_list()` and then
 + *   `add_pattern()`.
 + *
 + * - To add patterns from a file (e.g. `.git/info/exclude`), call
 + *   `add_patterns_from_file()` , and/or set `dir.exclude_per_dir`.  A
 + *   short-hand function `setup_standard_excludes()` can be used to set
 + *   up the standard set of exclude settings.
 + *
 + * - Set options described in the Data Structure section above.
 + *
 + * - Call `read_directory()`.
 + *
 + * - Use `dir.entries[]`.
 + *
 + * - Call `clear_directory()` when none of the contained elements are no longer in use.
 + *
 + */
 +
  struct dir_entry {
  	unsigned int len;
  	char name[FLEX_ARRAY]; /* more */