Merge branch 'lt/core-optim'

* lt/core-optim:
Optimize symlink/directory detection
Avoid some unnecessary lstat() calls
is_racy_timestamp(): do not check timestamp for gitlinks
diff-lib.c: rename check_work_tree_entity()
diff: a submodule not checked out is not modified
Add t7506 to test submodule related functions for git-status
t4027: test diff for submodule with empty directory
Make git-add behave more sensibly in a case-insensitive environment
When adding files to the index, add support for case-independent matches
Make unpack-tree update removed files before any updated files
Make branch merging aware of underlying case-insensitive filsystems
Add 'core.ignorecase' option
Make hash_name_lookup able to do case-independent lookups
Make "index_name_exists()" return the cache_entry it found
Move name hashing functions into a file of its own
Make unpack_trees_options bit flags actual bitfields

diff --combined cache.h
index 3442130a59fb7c41e16cab1cb8cd20bec5f71a3d,0d9d9e25770cd18cf83b810dc29ec10163aa1620..9cee9a5f3fb2e51f617dcf9f92defcd596b97c10
--- 1/cache.h
--- 2/cache.h
+++ b/cache.h
@@@ -133,6 -133,7 +133,7 @@@ struct cache_entry 
  #define CE_UPDATE    (0x10000)
  #define CE_REMOVE    (0x20000)
  #define CE_UPTODATE  (0x40000)
+ #define CE_ADDED     (0x80000)
  
  #define CE_HASHED    (0x100000)
  #define CE_UNHASHED  (0x200000)
@@@ -153,20 -154,6 +154,6 @@@ static inline void copy_cache_entry(str
        dst->ce_flags = (dst->ce_flags & ~CE_STATE_MASK) | state;
  }
  
- /*
-  * We don't actually *remove* it, we can just mark it invalid so that
-  * we won't find it in lookups.
-  *
-  * Not only would we have to search the lists (simple enough), but
-  * we'd also have to rehash other hash buckets in case this makes the
-  * hash bucket empty (common). So it's much better to just mark
-  * it.
-  */
- static inline void remove_index_entry(struct cache_entry *ce)
- {
-       ce->ce_flags |= CE_UNHASHED;
- }
- 
  static inline unsigned create_ce_flags(size_t len, unsigned stage)
  {
        if (len >= CE_NAMEMASK)
@@@ -241,6 -228,23 +228,23 @@@ struct index_state 
  
  extern struct index_state the_index;
  
+ /* Name hashing */
+ extern void add_name_hash(struct index_state *istate, struct cache_entry *ce);
+ /*
+  * We don't actually *remove* it, we can just mark it invalid so that
+  * we won't find it in lookups.
+  *
+  * Not only would we have to search the lists (simple enough), but
+  * we'd also have to rehash other hash buckets in case this makes the
+  * hash bucket empty (common). So it's much better to just mark
+  * it.
+  */
+ static inline void remove_name_hash(struct cache_entry *ce)
+ {
+       ce->ce_flags |= CE_UNHASHED;
+ }
+ 
+ 
  #ifndef NO_THE_INDEX_COMPATIBILITY_MACROS
  #define active_cache (the_index.cache)
  #define active_nr (the_index.cache_nr)
@@@ -257,11 -261,12 +261,12 @@@
  #define add_cache_entry(ce, option) add_index_entry(&the_index, (ce), (option))
  #define remove_cache_entry_at(pos) remove_index_entry_at(&the_index, (pos))
  #define remove_file_from_cache(path) remove_file_from_index(&the_index, (path))
+ #define add_to_cache(path, st, verbose) add_to_index(&the_index, (path), (st), (verbose))
  #define add_file_to_cache(path, verbose) add_file_to_index(&the_index, (path), (verbose))
  #define refresh_cache(flags) refresh_index(&the_index, (flags), NULL, NULL)
  #define ce_match_stat(ce, st, options) ie_match_stat(&the_index, (ce), (st), (options))
  #define ce_modified(ce, st, options) ie_modified(&the_index, (ce), (st), (options))
- #define cache_name_exists(name, namelen) index_name_exists(&the_index, (name), (namelen))
+ #define cache_name_exists(name, namelen, igncase) index_name_exists(&the_index, (name), (namelen), (igncase))
  #endif
  
  enum object_type {
@@@ -351,7 -356,7 +356,7 @@@ extern int write_index(const struct ind
  extern int discard_index(struct index_state *);
  extern int unmerged_index(const struct index_state *);
  extern int verify_path(const char *path);
- extern int index_name_exists(struct index_state *istate, const char *name, int namelen);
+ extern struct cache_entry *index_name_exists(struct index_state *istate, const char *name, int namelen, int igncase);
  extern int index_name_pos(const struct index_state *, const char *name, int namelen);
  #define ADD_CACHE_OK_TO_ADD 1         /* Ok to add */
  #define ADD_CACHE_OK_TO_REPLACE 2     /* Ok to replace file/directory */
@@@ -361,6 -366,7 +366,7 @@@ extern int add_index_entry(struct index
  extern struct cache_entry *refresh_cache_entry(struct cache_entry *ce, int really);
  extern int remove_index_entry_at(struct index_state *, int pos);
  extern int remove_file_from_index(struct index_state *, const char *path);
+ extern int add_to_index(struct index_state *, const char *path, struct stat *, int verbose);
  extern int add_file_to_index(struct index_state *, const char *path, int verbose);
  extern struct cache_entry *make_cache_entry(unsigned int mode, const unsigned char *sha1, const char *path, int stage, int refresh);
  extern int ce_same_name(struct cache_entry *a, struct cache_entry *b);
@@@ -405,6 -411,7 +411,7 @@@ extern int delete_ref(const char *, con
  extern int trust_executable_bit;
  extern int quote_path_fully;
  extern int has_symlinks;
+ extern int ignore_case;
  extern int assume_unchanged;
  extern int prefer_symlink_refs;
  extern int log_all_ref_updates;
@@@ -434,15 -441,7 +441,15 @@@ enum branch_track 
        BRANCH_TRACK_EXPLICIT,
  };
  
 +enum rebase_setup_type {
 +      AUTOREBASE_NEVER = 0,
 +      AUTOREBASE_LOCAL,
 +      AUTOREBASE_REMOTE,
 +      AUTOREBASE_ALWAYS,
 +};
 +
  extern enum branch_track git_branch_track;
 +extern enum rebase_setup_type autorebase;
  
  #define GIT_REPO_VERSION 0
  extern int repository_format_version;
@@@ -599,7 -598,7 +606,7 @@@ struct checkout 
  };
  
  extern int checkout_entry(struct cache_entry *ce, const struct checkout *state, char *topath);
- extern int has_symlink_leading_path(const char *name, char *last_symlink);
+ extern int has_symlink_leading_path(int len, const char *name);
  
  extern struct alternate_object_database {
        struct alternate_object_database *next;

diff --combined config.c
index cf2bfd35c8394579beed8fa565bfcfe33dbd7540,8fcb5db94f37c240734dfd9946c95b5f0f697ef8..4d00ebc7aac7726d8317760aa993ac0854933fda
--- 1/config.c
--- 2/config.c
+++ b/config.c
@@@ -350,6 -350,11 +350,11 @@@ int git_default_config(const char *var
                return 0;
        }
  
+       if (!strcmp(var, "core.ignorecase")) {
+               ignore_case = git_config_bool(var, value);
+               return 0;
+       }
+ 
        if (!strcmp(var, "core.bare")) {
                is_bare_repository_cfg = git_config_bool(var, value);
                return 0;
@@@ -487,21 -492,6 +492,21 @@@
                git_branch_track = git_config_bool(var, value);
                return 0;
        }
 +      if (!strcmp(var, "branch.autosetuprebase")) {
 +              if (!value)
 +                      return config_error_nonbool(var);
 +              else if (!strcmp(value, "never"))
 +                      autorebase = AUTOREBASE_NEVER;
 +              else if (!strcmp(value, "local"))
 +                      autorebase = AUTOREBASE_LOCAL;
 +              else if (!strcmp(value, "remote"))
 +                      autorebase = AUTOREBASE_REMOTE;
 +              else if (!strcmp(value, "always"))
 +                      autorebase = AUTOREBASE_ALWAYS;
 +              else
 +                      return error("Malformed value for %s", var);
 +              return 0;
 +      }
  
        /* Add other config variables here and to Documentation/config.txt. */
        return 0;

diff --combined environment.c
index 4892a302bd77c038a79a11935e21d556ede494cb,945574169b75ae1f0f0efad847d863104c1da3d1..55c252706317818db64af8ff3fbfde6cd23e3488
--- 1/environment.c
--- 2/environment.c
+++ b/environment.c
@@@ -14,6 -14,7 +14,7 @@@ char git_default_name[MAX_GITNAME]
  int trust_executable_bit = 1;
  int quote_path_fully = 1;
  int has_symlinks = 1;
+ int ignore_case;
  int assume_unchanged;
  int prefer_symlink_refs;
  int is_bare_repository_cfg = -1; /* unspecified */
@@@ -38,7 -39,6 +39,7 @@@ int auto_crlf = 0;    /* 1: both ways, -1
  enum safe_crlf safe_crlf = SAFE_CRLF_WARN;
  unsigned whitespace_rule_cfg = WS_DEFAULT_RULE;
  enum branch_track git_branch_track = BRANCH_TRACK_REMOTE;
 +enum rebase_setup_type autorebase = AUTOREBASE_NEVER;
  
  /* This is set by setup_git_dir_gently() and/or git_default_config() */
  char *git_work_tree_cfg;