summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-07-20 06:25:00 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-07-20 07:00:46 (GMT)
commit3f1b7b607a81cf56254fcc4ed417cc4344cde2a5 (patch)
treec0689ecbec758cf570989da64dcc4b15bf75ef89 /cache.h
parenta1b6fb04b1c1b581dfac5c13641af8b3ae44810f (diff)
downloadgit-3f1b7b607a81cf56254fcc4ed417cc4344cde2a5.zip
git-3f1b7b607a81cf56254fcc4ed417cc4344cde2a5.tar.gz
git-3f1b7b607a81cf56254fcc4ed417cc4344cde2a5.tar.bz2
refresh-index: fix bitmask assignment
5fdeacb (Teach update-index about --ignore-submodules, 2008-05-14) added a new refresh option flag but did not assign a unique bit for it correctly, and broke "update-index --ignore-missing". This fixes it. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cache.h b/cache.h
index ca382d4..9735b66 100644
--- a/cache.h
+++ b/cache.h
@@ -396,7 +396,7 @@ extern void fill_stat_cache_info(struct cache_entry *ce, struct stat *st);
#define REFRESH_UNMERGED 0x0002 /* allow unmerged */
#define REFRESH_QUIET 0x0004 /* be quiet about it */
#define REFRESH_IGNORE_MISSING 0x0008 /* ignore non-existent */
-#define REFRESH_IGNORE_SUBMODULES 0x0008 /* ignore submodules */
+#define REFRESH_IGNORE_SUBMODULES 0x0010 /* ignore submodules */
extern int refresh_index(struct index_state *, unsigned int flags, const char **pathspec, char *seen);
struct lock_file {