aboutsummaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-04-19 13:37:36 -0700
committerJunio C Hamano <gitster@pobox.com>2013-04-19 13:37:36 -0700
commitde91daf5e6c9346a54ec8afd331017470d280b12 (patch)
tree05302e81b1431efb8f0fb172851640054db363e0 /cache.h
parentd7bffe9fb63185fbac6f4f41e9fb760b4f230a7d (diff)
parent9df84e94ed16dfaeb50350d7e8ec36eee3fc213e (diff)
downloadgit-de91daf5e6c9346a54ec8afd331017470d280b12.tar.gz
git-de91daf5e6c9346a54ec8afd331017470d280b12.tar.xz
Merge branch 'jn/add-2.0-u-A-sans-pathspec' (early part)
In Git 2.0, "git add -u" and "git add -A" without any pathspec will update the index for all paths, including those outside the current directory, making it more consistent with "commit -a". To help the migration pain, a warning is issued when the differences between the current behaviour and the upcoming behaviour matters, i.e. when the user has local changes outside the current directory. * 'jn/add-2.0-u-A-sans-pathspec' (early part): add -A: only show pathless 'add -A' warning when changes exist outside cwd add -u: only show pathless 'add -u' warning when changes exist outside cwd add: make warn_pathless_add() a no-op after first call add: add a blank line at the end of pathless 'add [-u|-A]' warning add: make pathless 'add [-u|-A]' warning a file-global function
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/cache.h b/cache.h
index e1e8ce80e..ba5a47c48 100644
--- a/cache.h
+++ b/cache.h
@@ -465,6 +465,7 @@ extern int remove_file_from_index(struct index_state *, const char *path);
#define ADD_CACHE_IGNORE_ERRORS 4
#define ADD_CACHE_IGNORE_REMOVAL 8
#define ADD_CACHE_INTENT 16
+#define ADD_CACHE_IMPLICIT_DOT 32 /* internal to "git add -u/-A" */
extern int add_to_index(struct index_state *, const char *path, struct stat *, int flags);
extern int add_file_to_index(struct index_state *, const char *path, int flags);
extern struct cache_entry *make_cache_entry(unsigned int mode, const unsigned char *sha1, const char *path, int stage, int refresh);