Linus Torvalds | 8bc9a0c | 2005-04-07 15:16:10 -0700 | [diff] [blame] | 1 | /* |
| 2 | * GIT - The information manager from hell |
| 3 | * |
| 4 | * Copyright (C) Linus Torvalds, 2005 |
| 5 | */ |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 6 | #define NO_THE_INDEX_COMPATIBILITY_MACROS |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 7 | #include "cache.h" |
Brandon Williams | b2141fc | 2017-06-14 11:07:36 -0700 | [diff] [blame] | 8 | #include "config.h" |
Michael Haggerty | f6ecc62 | 2015-08-10 11:47:45 +0200 | [diff] [blame] | 9 | #include "tempfile.h" |
Michael Haggerty | 697cc8e | 2014-10-01 12:28:42 +0200 | [diff] [blame] | 10 | #include "lockfile.h" |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 11 | #include "cache-tree.h" |
Linus Torvalds | f35a6d3 | 2007-04-09 21:20:29 -0700 | [diff] [blame] | 12 | #include "refs.h" |
Alexandre Julliard | d616813 | 2007-08-11 23:59:01 +0200 | [diff] [blame] | 13 | #include "dir.h" |
Junio C Hamano | 041aee3 | 2008-07-21 01:24:17 -0700 | [diff] [blame] | 14 | #include "tree.h" |
| 15 | #include "commit.h" |
Junio C Hamano | 3942581 | 2008-08-21 01:44:53 -0700 | [diff] [blame] | 16 | #include "blob.h" |
Junio C Hamano | cfc5789 | 2009-12-25 00:30:51 -0800 | [diff] [blame] | 17 | #include "resolve-undo.h" |
Junio C Hamano | 6c9cd16 | 2012-04-03 15:53:15 -0700 | [diff] [blame] | 18 | #include "strbuf.h" |
| 19 | #include "varint.h" |
Nguyễn Thái Ngọc Duy | 5fc2fc8 | 2014-06-13 19:19:36 +0700 | [diff] [blame] | 20 | #include "split-index.h" |
Jeff King | a42643a | 2014-12-15 18:15:20 -0500 | [diff] [blame] | 21 | #include "utf8.h" |
Ben Peart | 883e248 | 2017-09-22 12:35:40 -0400 | [diff] [blame] | 22 | #include "fsmonitor.h" |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 23 | |
Thomas Gummerer | b60e188 | 2012-07-11 11:22:37 +0200 | [diff] [blame] | 24 | /* Mask for the name length in ce_flags in the on-disk index */ |
| 25 | |
| 26 | #define CE_NAMEMASK (0x0fff) |
| 27 | |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 28 | /* Index extensions. |
| 29 | * |
| 30 | * The first letter should be 'A'..'Z' for extensions that are not |
| 31 | * necessary for a correct operation (i.e. optimization data). |
| 32 | * When new extensions are added that _needs_ to be understood in |
| 33 | * order to correctly interpret the index file, pick character that |
| 34 | * is outside the range, to cause the reader to abort. |
| 35 | */ |
| 36 | |
| 37 | #define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) ) |
| 38 | #define CACHE_EXT_TREE 0x54524545 /* "TREE" */ |
Shawn O. Pearce | b659b49 | 2010-02-02 07:33:28 -0800 | [diff] [blame] | 39 | #define CACHE_EXT_RESOLVE_UNDO 0x52455543 /* "REUC" */ |
Nguyễn Thái Ngọc Duy | 5fc2fc8 | 2014-06-13 19:19:36 +0700 | [diff] [blame] | 40 | #define CACHE_EXT_LINK 0x6c696e6b /* "link" */ |
Nguyễn Thái Ngọc Duy | 83c094a | 2015-03-08 17:12:33 +0700 | [diff] [blame] | 41 | #define CACHE_EXT_UNTRACKED 0x554E5452 /* "UNTR" */ |
Ben Peart | 883e248 | 2017-09-22 12:35:40 -0400 | [diff] [blame] | 42 | #define CACHE_EXT_FSMONITOR 0x46534D4E /* "FSMN" */ |
Nguyễn Thái Ngọc Duy | 5fc2fc8 | 2014-06-13 19:19:36 +0700 | [diff] [blame] | 43 | |
| 44 | /* changes that can be kept in $GIT_DIR/index (basically all extensions) */ |
Nguyễn Thái Ngọc Duy | e0cf0d7 | 2014-06-13 19:19:37 +0700 | [diff] [blame] | 45 | #define EXTMASK (RESOLVE_UNDO_CHANGED | CACHE_TREE_CHANGED | \ |
Nguyễn Thái Ngọc Duy | c18b80a | 2014-06-13 19:19:44 +0700 | [diff] [blame] | 46 | CE_ENTRY_ADDED | CE_ENTRY_REMOVED | CE_ENTRY_CHANGED | \ |
Ben Peart | 883e248 | 2017-09-22 12:35:40 -0400 | [diff] [blame] | 47 | SPLIT_INDEX_ORDERED | UNTRACKED_CHANGED | FSMONITOR_CHANGED) |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 48 | |
Junio C Hamano | 228e94f | 2007-04-01 18:14:06 -0700 | [diff] [blame] | 49 | struct index_state the_index; |
Nguyễn Thái Ngọc Duy | 626f35c | 2014-06-13 19:19:24 +0700 | [diff] [blame] | 50 | static const char *alternate_index_output; |
Johannes Schindelin | 8fd2cb4 | 2006-07-25 21:32:18 -0700 | [diff] [blame] | 51 | |
Junio C Hamano | 9cb76b8 | 2008-01-22 23:01:13 -0800 | [diff] [blame] | 52 | static void set_index_entry(struct index_state *istate, int nr, struct cache_entry *ce) |
| 53 | { |
| 54 | istate->cache[nr] = ce; |
Linus Torvalds | 96872bc | 2008-03-21 13:16:24 -0700 | [diff] [blame] | 55 | add_name_hash(istate, ce); |
Junio C Hamano | 9cb76b8 | 2008-01-22 23:01:13 -0800 | [diff] [blame] | 56 | } |
| 57 | |
Linus Torvalds | cf55870 | 2008-01-22 18:41:14 -0800 | [diff] [blame] | 58 | static void replace_index_entry(struct index_state *istate, int nr, struct cache_entry *ce) |
| 59 | { |
| 60 | struct cache_entry *old = istate->cache[nr]; |
| 61 | |
Nguyễn Thái Ngọc Duy | 078a58e | 2014-06-13 19:19:39 +0700 | [diff] [blame] | 62 | replace_index_entry_in_base(istate, old, ce); |
Karsten Blees | 2092678 | 2013-02-28 00:57:48 +0100 | [diff] [blame] | 63 | remove_name_hash(istate, old); |
Karsten Blees | 5699d17 | 2013-11-14 20:24:37 +0100 | [diff] [blame] | 64 | free(old); |
Ben Peart | 0e267b7 | 2018-03-15 11:25:20 -0400 | [diff] [blame] | 65 | ce->ce_flags &= ~CE_HASHED; |
Linus Torvalds | a22c637 | 2008-02-22 20:37:40 -0800 | [diff] [blame] | 66 | set_index_entry(istate, nr, ce); |
Nguyễn Thái Ngọc Duy | 078a58e | 2014-06-13 19:19:39 +0700 | [diff] [blame] | 67 | ce->ce_flags |= CE_UPDATE_IN_BASE; |
Ben Peart | 883e248 | 2017-09-22 12:35:40 -0400 | [diff] [blame] | 68 | mark_fsmonitor_invalid(istate, ce); |
Nguyễn Thái Ngọc Duy | e636a7b | 2014-06-13 19:19:27 +0700 | [diff] [blame] | 69 | istate->cache_changed |= CE_ENTRY_CHANGED; |
Linus Torvalds | cf55870 | 2008-01-22 18:41:14 -0800 | [diff] [blame] | 70 | } |
| 71 | |
Petr Baudis | 81dc230 | 2008-07-21 02:25:56 +0200 | [diff] [blame] | 72 | void rename_index_entry_at(struct index_state *istate, int nr, const char *new_name) |
| 73 | { |
Brandon Williams | 285c2e2 | 2018-02-14 10:59:45 -0800 | [diff] [blame] | 74 | struct cache_entry *old_entry = istate->cache[nr], *new_entry; |
Petr Baudis | 81dc230 | 2008-07-21 02:25:56 +0200 | [diff] [blame] | 75 | int namelen = strlen(new_name); |
| 76 | |
Brandon Williams | 285c2e2 | 2018-02-14 10:59:45 -0800 | [diff] [blame] | 77 | new_entry = xmalloc(cache_entry_size(namelen)); |
| 78 | copy_cache_entry(new_entry, old_entry); |
| 79 | new_entry->ce_flags &= ~CE_HASHED; |
| 80 | new_entry->ce_namelen = namelen; |
| 81 | new_entry->index = 0; |
| 82 | memcpy(new_entry->name, new_name, namelen + 1); |
Petr Baudis | 81dc230 | 2008-07-21 02:25:56 +0200 | [diff] [blame] | 83 | |
Brandon Williams | 285c2e2 | 2018-02-14 10:59:45 -0800 | [diff] [blame] | 84 | cache_tree_invalidate_path(istate, old_entry->name); |
| 85 | untracked_cache_remove_from_index(istate, old_entry->name); |
Petr Baudis | 81dc230 | 2008-07-21 02:25:56 +0200 | [diff] [blame] | 86 | remove_index_entry_at(istate, nr); |
Brandon Williams | 285c2e2 | 2018-02-14 10:59:45 -0800 | [diff] [blame] | 87 | add_index_entry(istate, new_entry, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE); |
Petr Baudis | 81dc230 | 2008-07-21 02:25:56 +0200 | [diff] [blame] | 88 | } |
| 89 | |
Michael Haggerty | c21d39d | 2013-06-20 10:37:50 +0200 | [diff] [blame] | 90 | void fill_stat_data(struct stat_data *sd, struct stat *st) |
| 91 | { |
| 92 | sd->sd_ctime.sec = (unsigned int)st->st_ctime; |
| 93 | sd->sd_mtime.sec = (unsigned int)st->st_mtime; |
| 94 | sd->sd_ctime.nsec = ST_CTIME_NSEC(*st); |
| 95 | sd->sd_mtime.nsec = ST_MTIME_NSEC(*st); |
| 96 | sd->sd_dev = st->st_dev; |
| 97 | sd->sd_ino = st->st_ino; |
| 98 | sd->sd_uid = st->st_uid; |
| 99 | sd->sd_gid = st->st_gid; |
| 100 | sd->sd_size = st->st_size; |
| 101 | } |
| 102 | |
| 103 | int match_stat_data(const struct stat_data *sd, struct stat *st) |
| 104 | { |
| 105 | int changed = 0; |
| 106 | |
| 107 | if (sd->sd_mtime.sec != (unsigned int)st->st_mtime) |
| 108 | changed |= MTIME_CHANGED; |
| 109 | if (trust_ctime && check_stat && |
| 110 | sd->sd_ctime.sec != (unsigned int)st->st_ctime) |
| 111 | changed |= CTIME_CHANGED; |
| 112 | |
| 113 | #ifdef USE_NSEC |
| 114 | if (check_stat && sd->sd_mtime.nsec != ST_MTIME_NSEC(*st)) |
| 115 | changed |= MTIME_CHANGED; |
| 116 | if (trust_ctime && check_stat && |
| 117 | sd->sd_ctime.nsec != ST_CTIME_NSEC(*st)) |
| 118 | changed |= CTIME_CHANGED; |
| 119 | #endif |
| 120 | |
| 121 | if (check_stat) { |
| 122 | if (sd->sd_uid != (unsigned int) st->st_uid || |
| 123 | sd->sd_gid != (unsigned int) st->st_gid) |
| 124 | changed |= OWNER_CHANGED; |
| 125 | if (sd->sd_ino != (unsigned int) st->st_ino) |
| 126 | changed |= INODE_CHANGED; |
| 127 | } |
| 128 | |
| 129 | #ifdef USE_STDEV |
| 130 | /* |
| 131 | * st_dev breaks on network filesystems where different |
| 132 | * clients will have different views of what "device" |
| 133 | * the filesystem is on |
| 134 | */ |
| 135 | if (check_stat && sd->sd_dev != (unsigned int) st->st_dev) |
| 136 | changed |= INODE_CHANGED; |
| 137 | #endif |
| 138 | |
| 139 | if (sd->sd_size != (unsigned int) st->st_size) |
| 140 | changed |= DATA_CHANGED; |
| 141 | |
| 142 | return changed; |
| 143 | } |
| 144 | |
Junio C Hamano | 415e96c | 2005-05-15 14:23:12 -0700 | [diff] [blame] | 145 | /* |
| 146 | * This only updates the "non-critical" parts of the directory |
| 147 | * cache, ie the parts that aren't tracked by GIT, and only used |
| 148 | * to validate the cache. |
| 149 | */ |
| 150 | void fill_stat_cache_info(struct cache_entry *ce, struct stat *st) |
| 151 | { |
Michael Haggerty | c21d39d | 2013-06-20 10:37:50 +0200 | [diff] [blame] | 152 | fill_stat_data(&ce->ce_stat_data, st); |
Junio C Hamano | 5f73076 | 2006-02-08 21:15:24 -0800 | [diff] [blame] | 153 | |
| 154 | if (assume_unchanged) |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 155 | ce->ce_flags |= CE_VALID; |
Junio C Hamano | eadb583 | 2008-01-18 23:45:24 -0800 | [diff] [blame] | 156 | |
Ben Peart | 883e248 | 2017-09-22 12:35:40 -0400 | [diff] [blame] | 157 | if (S_ISREG(st->st_mode)) { |
Junio C Hamano | eadb583 | 2008-01-18 23:45:24 -0800 | [diff] [blame] | 158 | ce_mark_uptodate(ce); |
Ben Peart | 883e248 | 2017-09-22 12:35:40 -0400 | [diff] [blame] | 159 | mark_fsmonitor_valid(ce); |
| 160 | } |
Junio C Hamano | 415e96c | 2005-05-15 14:23:12 -0700 | [diff] [blame] | 161 | } |
| 162 | |
René Scharfe | 21a6b9f | 2013-06-02 17:46:52 +0200 | [diff] [blame] | 163 | static int ce_compare_data(const struct cache_entry *ce, struct stat *st) |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 164 | { |
| 165 | int match = -1; |
Junio C Hamano | 1b8ac5e | 2016-10-28 06:23:07 -0700 | [diff] [blame] | 166 | int fd = git_open_cloexec(ce->name, O_RDONLY); |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 167 | |
| 168 | if (fd >= 0) { |
Patryk Obara | bebfecb | 2017-08-20 22:09:27 +0200 | [diff] [blame] | 169 | struct object_id oid; |
Patryk Obara | e350655 | 2017-08-20 22:09:29 +0200 | [diff] [blame] | 170 | if (!index_fd(&oid, fd, st, OBJ_BLOB, ce->name, 0)) |
Patryk Obara | bebfecb | 2017-08-20 22:09:27 +0200 | [diff] [blame] | 171 | match = oidcmp(&oid, &ce->oid); |
Linus Torvalds | 7f8508e | 2006-07-31 09:55:15 -0700 | [diff] [blame] | 172 | /* index_fd() closed the file descriptor already */ |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 173 | } |
| 174 | return match; |
| 175 | } |
| 176 | |
René Scharfe | 21a6b9f | 2013-06-02 17:46:52 +0200 | [diff] [blame] | 177 | static int ce_compare_link(const struct cache_entry *ce, size_t expected_size) |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 178 | { |
| 179 | int match = -1; |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 180 | void *buffer; |
| 181 | unsigned long size; |
Nicolas Pitre | 21666f1 | 2007-02-26 14:55:59 -0500 | [diff] [blame] | 182 | enum object_type type; |
Linus Torvalds | a60272b | 2008-12-17 09:47:27 -0800 | [diff] [blame] | 183 | struct strbuf sb = STRBUF_INIT; |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 184 | |
Linus Torvalds | a60272b | 2008-12-17 09:47:27 -0800 | [diff] [blame] | 185 | if (strbuf_readlink(&sb, ce->name, expected_size)) |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 186 | return -1; |
Linus Torvalds | a60272b | 2008-12-17 09:47:27 -0800 | [diff] [blame] | 187 | |
brian m. carlson | b4f5aca | 2018-03-12 02:27:53 +0000 | [diff] [blame] | 188 | buffer = read_object_file(&ce->oid, &type, &size); |
Linus Torvalds | a60272b | 2008-12-17 09:47:27 -0800 | [diff] [blame] | 189 | if (buffer) { |
| 190 | if (size == sb.len) |
| 191 | match = memcmp(buffer, sb.buf, size); |
| 192 | free(buffer); |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 193 | } |
Linus Torvalds | a60272b | 2008-12-17 09:47:27 -0800 | [diff] [blame] | 194 | strbuf_release(&sb); |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 195 | return match; |
| 196 | } |
| 197 | |
René Scharfe | 21a6b9f | 2013-06-02 17:46:52 +0200 | [diff] [blame] | 198 | static int ce_compare_gitlink(const struct cache_entry *ce) |
Linus Torvalds | f35a6d3 | 2007-04-09 21:20:29 -0700 | [diff] [blame] | 199 | { |
brian m. carlson | 1053fe8 | 2017-10-15 22:07:06 +0000 | [diff] [blame] | 200 | struct object_id oid; |
Linus Torvalds | f35a6d3 | 2007-04-09 21:20:29 -0700 | [diff] [blame] | 201 | |
| 202 | /* |
| 203 | * We don't actually require that the .git directory |
Martin Waitz | 302b928 | 2007-05-21 22:08:28 +0200 | [diff] [blame] | 204 | * under GITLINK directory be a valid git directory. It |
Linus Torvalds | f35a6d3 | 2007-04-09 21:20:29 -0700 | [diff] [blame] | 205 | * might even be missing (in case nobody populated that |
| 206 | * sub-project). |
| 207 | * |
| 208 | * If so, we consider it always to match. |
| 209 | */ |
brian m. carlson | a98e610 | 2017-10-15 22:07:07 +0000 | [diff] [blame] | 210 | if (resolve_gitlink_ref(ce->name, "HEAD", &oid) < 0) |
Linus Torvalds | f35a6d3 | 2007-04-09 21:20:29 -0700 | [diff] [blame] | 211 | return 0; |
brian m. carlson | 1053fe8 | 2017-10-15 22:07:06 +0000 | [diff] [blame] | 212 | return oidcmp(&oid, &ce->oid); |
Linus Torvalds | f35a6d3 | 2007-04-09 21:20:29 -0700 | [diff] [blame] | 213 | } |
| 214 | |
René Scharfe | 21a6b9f | 2013-06-02 17:46:52 +0200 | [diff] [blame] | 215 | static int ce_modified_check_fs(const struct cache_entry *ce, struct stat *st) |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 216 | { |
| 217 | switch (st->st_mode & S_IFMT) { |
| 218 | case S_IFREG: |
| 219 | if (ce_compare_data(ce, st)) |
| 220 | return DATA_CHANGED; |
| 221 | break; |
| 222 | case S_IFLNK: |
Shawn O. Pearce | dc49cd7 | 2007-03-06 20:44:37 -0500 | [diff] [blame] | 223 | if (ce_compare_link(ce, xsize_t(st->st_size))) |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 224 | return DATA_CHANGED; |
| 225 | break; |
Linus Torvalds | a8ee75b | 2007-04-13 09:24:13 -0700 | [diff] [blame] | 226 | case S_IFDIR: |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 227 | if (S_ISGITLINK(ce->ce_mode)) |
Junio C Hamano | c70115b | 2008-07-29 01:13:44 -0700 | [diff] [blame] | 228 | return ce_compare_gitlink(ce) ? DATA_CHANGED : 0; |
Jeff King | 1cf01a3 | 2017-09-21 02:25:41 -0400 | [diff] [blame] | 229 | /* else fallthrough */ |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 230 | default: |
| 231 | return TYPE_CHANGED; |
| 232 | } |
| 233 | return 0; |
| 234 | } |
| 235 | |
René Scharfe | 21a6b9f | 2013-06-02 17:46:52 +0200 | [diff] [blame] | 236 | static int ce_match_stat_basic(const struct cache_entry *ce, struct stat *st) |
Linus Torvalds | 734aab7 | 2005-04-09 09:48:20 -0700 | [diff] [blame] | 237 | { |
| 238 | unsigned int changed = 0; |
| 239 | |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 240 | if (ce->ce_flags & CE_REMOVE) |
| 241 | return MODE_CHANGED | DATA_CHANGED | TYPE_CHANGED; |
| 242 | |
| 243 | switch (ce->ce_mode & S_IFMT) { |
Kay Sievers | 8ae0a8c | 2005-05-05 14:38:25 +0200 | [diff] [blame] | 244 | case S_IFREG: |
| 245 | changed |= !S_ISREG(st->st_mode) ? TYPE_CHANGED : 0; |
Junio C Hamano | 3e09cdf | 2005-10-11 18:45:33 -0700 | [diff] [blame] | 246 | /* We consider only the owner x bit to be relevant for |
| 247 | * "mode changes" |
| 248 | */ |
| 249 | if (trust_executable_bit && |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 250 | (0100 & (ce->ce_mode ^ st->st_mode))) |
Kay Sievers | ffbe1ad | 2005-05-06 15:45:01 +0200 | [diff] [blame] | 251 | changed |= MODE_CHANGED; |
Kay Sievers | 8ae0a8c | 2005-05-05 14:38:25 +0200 | [diff] [blame] | 252 | break; |
| 253 | case S_IFLNK: |
Johannes Sixt | 78a8d64 | 2007-03-02 22:11:30 +0100 | [diff] [blame] | 254 | if (!S_ISLNK(st->st_mode) && |
| 255 | (has_symlinks || !S_ISREG(st->st_mode))) |
| 256 | changed |= TYPE_CHANGED; |
Kay Sievers | 8ae0a8c | 2005-05-05 14:38:25 +0200 | [diff] [blame] | 257 | break; |
Martin Waitz | 302b928 | 2007-05-21 22:08:28 +0200 | [diff] [blame] | 258 | case S_IFGITLINK: |
Junio C Hamano | c70115b | 2008-07-29 01:13:44 -0700 | [diff] [blame] | 259 | /* We ignore most of the st_xxx fields for gitlinks */ |
Linus Torvalds | f35a6d3 | 2007-04-09 21:20:29 -0700 | [diff] [blame] | 260 | if (!S_ISDIR(st->st_mode)) |
| 261 | changed |= TYPE_CHANGED; |
| 262 | else if (ce_compare_gitlink(ce)) |
| 263 | changed |= DATA_CHANGED; |
Linus Torvalds | a8ee75b | 2007-04-13 09:24:13 -0700 | [diff] [blame] | 264 | return changed; |
Kay Sievers | 8ae0a8c | 2005-05-05 14:38:25 +0200 | [diff] [blame] | 265 | default: |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 266 | die("internal error: ce_mode is %o", ce->ce_mode); |
Kay Sievers | 8ae0a8c | 2005-05-05 14:38:25 +0200 | [diff] [blame] | 267 | } |
Linus Torvalds | ccc4feb | 2005-04-15 10:44:27 -0700 | [diff] [blame] | 268 | |
Michael Haggerty | c21d39d | 2013-06-20 10:37:50 +0200 | [diff] [blame] | 269 | changed |= match_stat_data(&ce->ce_stat_data, st); |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 270 | |
Linus Torvalds | f49c2c2 | 2008-06-10 10:44:43 -0700 | [diff] [blame] | 271 | /* Racily smudged entry? */ |
Michael Haggerty | c21d39d | 2013-06-20 10:37:50 +0200 | [diff] [blame] | 272 | if (!ce->ce_stat_data.sd_size) { |
brian m. carlson | 99d1a98 | 2016-09-05 20:07:52 +0000 | [diff] [blame] | 273 | if (!is_empty_blob_sha1(ce->oid.hash)) |
Linus Torvalds | f49c2c2 | 2008-06-10 10:44:43 -0700 | [diff] [blame] | 274 | changed |= DATA_CHANGED; |
| 275 | } |
| 276 | |
Junio C Hamano | 407c8eb | 2005-12-20 12:12:18 -0800 | [diff] [blame] | 277 | return changed; |
| 278 | } |
| 279 | |
Nguyễn Thái Ngọc Duy | 2bb4cda | 2015-03-08 17:12:36 +0700 | [diff] [blame] | 280 | static int is_racy_stat(const struct index_state *istate, |
| 281 | const struct stat_data *sd) |
| 282 | { |
| 283 | return (istate->timestamp.sec && |
| 284 | #ifdef USE_NSEC |
| 285 | /* nanosecond timestamped files can also be racy! */ |
| 286 | (istate->timestamp.sec < sd->sd_mtime.sec || |
| 287 | (istate->timestamp.sec == sd->sd_mtime.sec && |
| 288 | istate->timestamp.nsec <= sd->sd_mtime.nsec)) |
| 289 | #else |
| 290 | istate->timestamp.sec <= sd->sd_mtime.sec |
| 291 | #endif |
| 292 | ); |
| 293 | } |
| 294 | |
René Scharfe | 21a6b9f | 2013-06-02 17:46:52 +0200 | [diff] [blame] | 295 | static int is_racy_timestamp(const struct index_state *istate, |
| 296 | const struct cache_entry *ce) |
Junio C Hamano | 6d91da6 | 2008-01-21 00:44:50 -0800 | [diff] [blame] | 297 | { |
Junio C Hamano | 050288d | 2008-05-03 17:24:28 -0700 | [diff] [blame] | 298 | return (!S_ISGITLINK(ce->ce_mode) && |
Nguyễn Thái Ngọc Duy | 2bb4cda | 2015-03-08 17:12:36 +0700 | [diff] [blame] | 299 | is_racy_stat(istate, &ce->ce_stat_data)); |
Junio C Hamano | 6d91da6 | 2008-01-21 00:44:50 -0800 | [diff] [blame] | 300 | } |
| 301 | |
Nguyễn Thái Ngọc Duy | ed4efab | 2015-03-08 17:12:37 +0700 | [diff] [blame] | 302 | int match_stat_data_racy(const struct index_state *istate, |
| 303 | const struct stat_data *sd, struct stat *st) |
| 304 | { |
| 305 | if (is_racy_stat(istate, sd)) |
| 306 | return MTIME_CHANGED; |
| 307 | return match_stat_data(sd, st); |
Junio C Hamano | 407c8eb | 2005-12-20 12:12:18 -0800 | [diff] [blame] | 308 | } |
| 309 | |
Ben Peart | 883e248 | 2017-09-22 12:35:40 -0400 | [diff] [blame] | 310 | int ie_match_stat(struct index_state *istate, |
René Scharfe | 21a6b9f | 2013-06-02 17:46:52 +0200 | [diff] [blame] | 311 | const struct cache_entry *ce, struct stat *st, |
Junio C Hamano | 4bd5b7d | 2007-11-10 00:15:03 -0800 | [diff] [blame] | 312 | unsigned int options) |
Junio C Hamano | 407c8eb | 2005-12-20 12:12:18 -0800 | [diff] [blame] | 313 | { |
Junio C Hamano | 5f73076 | 2006-02-08 21:15:24 -0800 | [diff] [blame] | 314 | unsigned int changed; |
Junio C Hamano | 4bd5b7d | 2007-11-10 00:15:03 -0800 | [diff] [blame] | 315 | int ignore_valid = options & CE_MATCH_IGNORE_VALID; |
Nguyễn Thái Ngọc Duy | 56cac48 | 2009-12-14 18:43:58 +0700 | [diff] [blame] | 316 | int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE; |
Junio C Hamano | 4bd5b7d | 2007-11-10 00:15:03 -0800 | [diff] [blame] | 317 | int assume_racy_is_modified = options & CE_MATCH_RACY_IS_DIRTY; |
Ben Peart | 883e248 | 2017-09-22 12:35:40 -0400 | [diff] [blame] | 318 | int ignore_fsmonitor = options & CE_MATCH_IGNORE_FSMONITOR; |
Junio C Hamano | 5f73076 | 2006-02-08 21:15:24 -0800 | [diff] [blame] | 319 | |
Ben Peart | 883e248 | 2017-09-22 12:35:40 -0400 | [diff] [blame] | 320 | if (!ignore_fsmonitor) |
| 321 | refresh_fsmonitor(istate); |
Junio C Hamano | 5f73076 | 2006-02-08 21:15:24 -0800 | [diff] [blame] | 322 | /* |
| 323 | * If it's marked as always valid in the index, it's |
| 324 | * valid whatever the checked-out copy says. |
Nguyễn Thái Ngọc Duy | 56cac48 | 2009-12-14 18:43:58 +0700 | [diff] [blame] | 325 | * |
| 326 | * skip-worktree has the same effect with higher precedence |
Junio C Hamano | 5f73076 | 2006-02-08 21:15:24 -0800 | [diff] [blame] | 327 | */ |
Nguyễn Thái Ngọc Duy | 56cac48 | 2009-12-14 18:43:58 +0700 | [diff] [blame] | 328 | if (!ignore_skip_worktree && ce_skip_worktree(ce)) |
| 329 | return 0; |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 330 | if (!ignore_valid && (ce->ce_flags & CE_VALID)) |
Junio C Hamano | 5f73076 | 2006-02-08 21:15:24 -0800 | [diff] [blame] | 331 | return 0; |
Ben Peart | 883e248 | 2017-09-22 12:35:40 -0400 | [diff] [blame] | 332 | if (!ignore_fsmonitor && (ce->ce_flags & CE_FSMONITOR_VALID)) |
| 333 | return 0; |
Junio C Hamano | 5f73076 | 2006-02-08 21:15:24 -0800 | [diff] [blame] | 334 | |
Junio C Hamano | 331fcb5 | 2008-11-28 19:56:34 -0800 | [diff] [blame] | 335 | /* |
| 336 | * Intent-to-add entries have not been added, so the index entry |
| 337 | * by definition never matches what is in the work tree until it |
| 338 | * actually gets added. |
| 339 | */ |
Nguyễn Thái Ngọc Duy | 895ff3b | 2015-08-22 08:08:05 +0700 | [diff] [blame] | 340 | if (ce_intent_to_add(ce)) |
Junio C Hamano | 331fcb5 | 2008-11-28 19:56:34 -0800 | [diff] [blame] | 341 | return DATA_CHANGED | TYPE_CHANGED | MODE_CHANGED; |
| 342 | |
Junio C Hamano | 5f73076 | 2006-02-08 21:15:24 -0800 | [diff] [blame] | 343 | changed = ce_match_stat_basic(ce, st); |
Junio C Hamano | 407c8eb | 2005-12-20 12:12:18 -0800 | [diff] [blame] | 344 | |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 345 | /* |
| 346 | * Within 1 second of this sequence: |
| 347 | * echo xyzzy >file && git-update-index --add file |
| 348 | * running this command: |
| 349 | * echo frotz >file |
| 350 | * would give a falsely clean cache entry. The mtime and |
| 351 | * length match the cache, and other stat fields do not change. |
| 352 | * |
| 353 | * We could detect this at update-index time (the cache entry |
| 354 | * being registered/updated records the same time as "now") |
| 355 | * and delay the return from git-update-index, but that would |
| 356 | * effectively mean we can make at most one commit per second, |
| 357 | * which is not acceptable. Instead, we check cache entries |
| 358 | * whose mtime are the same as the index file timestamp more |
Junio C Hamano | 5f73076 | 2006-02-08 21:15:24 -0800 | [diff] [blame] | 359 | * carefully than others. |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 360 | */ |
Junio C Hamano | 6d91da6 | 2008-01-21 00:44:50 -0800 | [diff] [blame] | 361 | if (!changed && is_racy_timestamp(istate, ce)) { |
Junio C Hamano | 42f7740 | 2006-08-15 21:38:07 -0700 | [diff] [blame] | 362 | if (assume_racy_is_modified) |
| 363 | changed |= DATA_CHANGED; |
| 364 | else |
| 365 | changed |= ce_modified_check_fs(ce, st); |
| 366 | } |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 367 | |
Linus Torvalds | 734aab7 | 2005-04-09 09:48:20 -0700 | [diff] [blame] | 368 | return changed; |
| 369 | } |
| 370 | |
Ben Peart | 883e248 | 2017-09-22 12:35:40 -0400 | [diff] [blame] | 371 | int ie_modified(struct index_state *istate, |
René Scharfe | 21a6b9f | 2013-06-02 17:46:52 +0200 | [diff] [blame] | 372 | const struct cache_entry *ce, |
| 373 | struct stat *st, unsigned int options) |
Junio C Hamano | b039189 | 2005-09-19 15:11:15 -0700 | [diff] [blame] | 374 | { |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 375 | int changed, changed_fs; |
Junio C Hamano | 4bd5b7d | 2007-11-10 00:15:03 -0800 | [diff] [blame] | 376 | |
| 377 | changed = ie_match_stat(istate, ce, st, options); |
Junio C Hamano | b039189 | 2005-09-19 15:11:15 -0700 | [diff] [blame] | 378 | if (!changed) |
| 379 | return 0; |
Junio C Hamano | b039189 | 2005-09-19 15:11:15 -0700 | [diff] [blame] | 380 | /* |
| 381 | * If the mode or type has changed, there's no point in trying |
| 382 | * to refresh the entry - it's not going to match |
| 383 | */ |
| 384 | if (changed & (MODE_CHANGED | TYPE_CHANGED)) |
| 385 | return changed; |
| 386 | |
Junio C Hamano | c70115b | 2008-07-29 01:13:44 -0700 | [diff] [blame] | 387 | /* |
| 388 | * Immediately after read-tree or update-index --cacheinfo, |
| 389 | * the length field is zero, as we have never even read the |
| 390 | * lstat(2) information once, and we cannot trust DATA_CHANGED |
| 391 | * returned by ie_match_stat() which in turn was returned by |
| 392 | * ce_match_stat_basic() to signal that the filesize of the |
| 393 | * blob changed. We have to actually go to the filesystem to |
| 394 | * see if the contents match, and if so, should answer "unchanged". |
| 395 | * |
| 396 | * The logic does not apply to gitlinks, as ce_match_stat_basic() |
| 397 | * already has checked the actual HEAD from the filesystem in the |
| 398 | * subproject. If ie_match_stat() already said it is different, |
| 399 | * then we know it is. |
Junio C Hamano | b039189 | 2005-09-19 15:11:15 -0700 | [diff] [blame] | 400 | */ |
Junio C Hamano | c70115b | 2008-07-29 01:13:44 -0700 | [diff] [blame] | 401 | if ((changed & DATA_CHANGED) && |
Michael Haggerty | c21d39d | 2013-06-20 10:37:50 +0200 | [diff] [blame] | 402 | (S_ISGITLINK(ce->ce_mode) || ce->ce_stat_data.sd_size != 0)) |
Junio C Hamano | b039189 | 2005-09-19 15:11:15 -0700 | [diff] [blame] | 403 | return changed; |
| 404 | |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 405 | changed_fs = ce_modified_check_fs(ce, st); |
| 406 | if (changed_fs) |
| 407 | return changed | changed_fs; |
Junio C Hamano | b039189 | 2005-09-19 15:11:15 -0700 | [diff] [blame] | 408 | return 0; |
| 409 | } |
| 410 | |
Linus Torvalds | 958ba6c | 2005-05-20 09:09:18 -0700 | [diff] [blame] | 411 | int base_name_compare(const char *name1, int len1, int mode1, |
| 412 | const char *name2, int len2, int mode2) |
| 413 | { |
| 414 | unsigned char c1, c2; |
| 415 | int len = len1 < len2 ? len1 : len2; |
| 416 | int cmp; |
| 417 | |
| 418 | cmp = memcmp(name1, name2, len); |
| 419 | if (cmp) |
| 420 | return cmp; |
| 421 | c1 = name1[len]; |
| 422 | c2 = name2[len]; |
Linus Torvalds | 1833a92 | 2007-04-11 14:39:12 -0700 | [diff] [blame] | 423 | if (!c1 && S_ISDIR(mode1)) |
Linus Torvalds | 958ba6c | 2005-05-20 09:09:18 -0700 | [diff] [blame] | 424 | c1 = '/'; |
Linus Torvalds | 1833a92 | 2007-04-11 14:39:12 -0700 | [diff] [blame] | 425 | if (!c2 && S_ISDIR(mode2)) |
Linus Torvalds | 958ba6c | 2005-05-20 09:09:18 -0700 | [diff] [blame] | 426 | c2 = '/'; |
| 427 | return (c1 < c2) ? -1 : (c1 > c2) ? 1 : 0; |
| 428 | } |
| 429 | |
Linus Torvalds | 0ab9e1e | 2008-03-05 18:25:10 -0800 | [diff] [blame] | 430 | /* |
| 431 | * df_name_compare() is identical to base_name_compare(), except it |
| 432 | * compares conflicting directory/file entries as equal. Note that |
| 433 | * while a directory name compares as equal to a regular file, they |
| 434 | * then individually compare _differently_ to a filename that has |
| 435 | * a dot after the basename (because '\0' < '.' < '/'). |
| 436 | * |
| 437 | * This is used by routines that want to traverse the git namespace |
| 438 | * but then handle conflicting entries together when possible. |
| 439 | */ |
| 440 | int df_name_compare(const char *name1, int len1, int mode1, |
| 441 | const char *name2, int len2, int mode2) |
| 442 | { |
| 443 | int len = len1 < len2 ? len1 : len2, cmp; |
| 444 | unsigned char c1, c2; |
| 445 | |
| 446 | cmp = memcmp(name1, name2, len); |
| 447 | if (cmp) |
| 448 | return cmp; |
| 449 | /* Directories and files compare equal (same length, same name) */ |
| 450 | if (len1 == len2) |
| 451 | return 0; |
| 452 | c1 = name1[len]; |
| 453 | if (!c1 && S_ISDIR(mode1)) |
| 454 | c1 = '/'; |
| 455 | c2 = name2[len]; |
| 456 | if (!c2 && S_ISDIR(mode2)) |
| 457 | c2 = '/'; |
| 458 | if (c1 == '/' && !c2) |
| 459 | return 0; |
| 460 | if (c2 == '/' && !c1) |
| 461 | return 0; |
| 462 | return c1 - c2; |
| 463 | } |
| 464 | |
Jeremiah Mahler | ccdd4a0 | 2014-06-19 19:06:44 -0700 | [diff] [blame] | 465 | int name_compare(const char *name1, size_t len1, const char *name2, size_t len2) |
Linus Torvalds | eb38c22 | 2005-04-09 09:26:55 -0700 | [diff] [blame] | 466 | { |
Jeremiah Mahler | ccdd4a0 | 2014-06-19 19:06:44 -0700 | [diff] [blame] | 467 | size_t min_len = (len1 < len2) ? len1 : len2; |
| 468 | int cmp = memcmp(name1, name2, min_len); |
Linus Torvalds | eb38c22 | 2005-04-09 09:26:55 -0700 | [diff] [blame] | 469 | if (cmp) |
| 470 | return cmp; |
| 471 | if (len1 < len2) |
| 472 | return -1; |
| 473 | if (len1 > len2) |
| 474 | return 1; |
Jeremiah Mahler | ccdd4a0 | 2014-06-19 19:06:44 -0700 | [diff] [blame] | 475 | return 0; |
| 476 | } |
| 477 | |
| 478 | int cache_name_stage_compare(const char *name1, int len1, int stage1, const char *name2, int len2, int stage2) |
| 479 | { |
| 480 | int cmp; |
| 481 | |
| 482 | cmp = name_compare(name1, len1, name2, len2); |
| 483 | if (cmp) |
| 484 | return cmp; |
Junio C Hamano | 5f73076 | 2006-02-08 21:15:24 -0800 | [diff] [blame] | 485 | |
Thomas Gummerer | b60e188 | 2012-07-11 11:22:37 +0200 | [diff] [blame] | 486 | if (stage1 < stage2) |
Linus Torvalds | 95fd5bf | 2005-04-15 22:51:44 -0700 | [diff] [blame] | 487 | return -1; |
Thomas Gummerer | b60e188 | 2012-07-11 11:22:37 +0200 | [diff] [blame] | 488 | if (stage1 > stage2) |
Linus Torvalds | 95fd5bf | 2005-04-15 22:51:44 -0700 | [diff] [blame] | 489 | return 1; |
Linus Torvalds | eb38c22 | 2005-04-09 09:26:55 -0700 | [diff] [blame] | 490 | return 0; |
| 491 | } |
| 492 | |
Junio C Hamano | 357e9c6 | 2012-09-15 22:44:31 -0700 | [diff] [blame] | 493 | static int index_name_stage_pos(const struct index_state *istate, const char *name, int namelen, int stage) |
Linus Torvalds | eb38c22 | 2005-04-09 09:26:55 -0700 | [diff] [blame] | 494 | { |
| 495 | int first, last; |
| 496 | |
| 497 | first = 0; |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 498 | last = istate->cache_nr; |
Linus Torvalds | eb38c22 | 2005-04-09 09:26:55 -0700 | [diff] [blame] | 499 | while (last > first) { |
| 500 | int next = (last + first) >> 1; |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 501 | struct cache_entry *ce = istate->cache[next]; |
Thomas Gummerer | b60e188 | 2012-07-11 11:22:37 +0200 | [diff] [blame] | 502 | int cmp = cache_name_stage_compare(name, namelen, stage, ce->name, ce_namelen(ce), ce_stage(ce)); |
Linus Torvalds | eb38c22 | 2005-04-09 09:26:55 -0700 | [diff] [blame] | 503 | if (!cmp) |
Linus Torvalds | 76e7f4e | 2005-04-10 22:06:50 -0700 | [diff] [blame] | 504 | return next; |
Linus Torvalds | eb38c22 | 2005-04-09 09:26:55 -0700 | [diff] [blame] | 505 | if (cmp < 0) { |
| 506 | last = next; |
| 507 | continue; |
| 508 | } |
| 509 | first = next+1; |
| 510 | } |
Linus Torvalds | 76e7f4e | 2005-04-10 22:06:50 -0700 | [diff] [blame] | 511 | return -first-1; |
Linus Torvalds | eb38c22 | 2005-04-09 09:26:55 -0700 | [diff] [blame] | 512 | } |
| 513 | |
Thomas Gummerer | b60e188 | 2012-07-11 11:22:37 +0200 | [diff] [blame] | 514 | int index_name_pos(const struct index_state *istate, const char *name, int namelen) |
| 515 | { |
| 516 | return index_name_stage_pos(istate, name, namelen, 0); |
| 517 | } |
| 518 | |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 519 | int remove_index_entry_at(struct index_state *istate, int pos) |
Linus Torvalds | 7b937ca | 2005-04-16 12:05:45 -0700 | [diff] [blame] | 520 | { |
Linus Torvalds | cf55870 | 2008-01-22 18:41:14 -0800 | [diff] [blame] | 521 | struct cache_entry *ce = istate->cache[pos]; |
| 522 | |
Junio C Hamano | cfc5789 | 2009-12-25 00:30:51 -0800 | [diff] [blame] | 523 | record_resolve_undo(istate, ce); |
Karsten Blees | 2092678 | 2013-02-28 00:57:48 +0100 | [diff] [blame] | 524 | remove_name_hash(istate, ce); |
Nguyễn Thái Ngọc Duy | 045113a | 2014-06-13 19:19:38 +0700 | [diff] [blame] | 525 | save_or_free_index_entry(istate, ce); |
Nguyễn Thái Ngọc Duy | e636a7b | 2014-06-13 19:19:27 +0700 | [diff] [blame] | 526 | istate->cache_changed |= CE_ENTRY_REMOVED; |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 527 | istate->cache_nr--; |
| 528 | if (pos >= istate->cache_nr) |
Linus Torvalds | 7b937ca | 2005-04-16 12:05:45 -0700 | [diff] [blame] | 529 | return 0; |
René Scharfe | f331ab9 | 2017-07-15 22:00:45 +0200 | [diff] [blame] | 530 | MOVE_ARRAY(istate->cache + pos, istate->cache + pos + 1, |
| 531 | istate->cache_nr - pos); |
Linus Torvalds | 7b937ca | 2005-04-16 12:05:45 -0700 | [diff] [blame] | 532 | return 1; |
| 533 | } |
| 534 | |
Kjetil Barvik | 36419c8 | 2009-02-18 23:18:03 +0100 | [diff] [blame] | 535 | /* |
Ondřej Bílka | 98e023d | 2013-07-29 10:18:21 +0200 | [diff] [blame] | 536 | * Remove all cache entries marked for removal, that is where |
Kjetil Barvik | 36419c8 | 2009-02-18 23:18:03 +0100 | [diff] [blame] | 537 | * CE_REMOVE is set in ce_flags. This is much more effective than |
| 538 | * calling remove_index_entry_at() for each entry to be removed. |
| 539 | */ |
| 540 | void remove_marked_cache_entries(struct index_state *istate) |
| 541 | { |
| 542 | struct cache_entry **ce_array = istate->cache; |
| 543 | unsigned int i, j; |
| 544 | |
| 545 | for (i = j = 0; i < istate->cache_nr; i++) { |
Karsten Blees | 5699d17 | 2013-11-14 20:24:37 +0100 | [diff] [blame] | 546 | if (ce_array[i]->ce_flags & CE_REMOVE) { |
Karsten Blees | 2092678 | 2013-02-28 00:57:48 +0100 | [diff] [blame] | 547 | remove_name_hash(istate, ce_array[i]); |
Nguyễn Thái Ngọc Duy | 045113a | 2014-06-13 19:19:38 +0700 | [diff] [blame] | 548 | save_or_free_index_entry(istate, ce_array[i]); |
Karsten Blees | 5699d17 | 2013-11-14 20:24:37 +0100 | [diff] [blame] | 549 | } |
Kjetil Barvik | 36419c8 | 2009-02-18 23:18:03 +0100 | [diff] [blame] | 550 | else |
| 551 | ce_array[j++] = ce_array[i]; |
| 552 | } |
Nguyễn Thái Ngọc Duy | ad837d9 | 2014-06-13 19:19:26 +0700 | [diff] [blame] | 553 | if (j == istate->cache_nr) |
| 554 | return; |
Nguyễn Thái Ngọc Duy | e636a7b | 2014-06-13 19:19:27 +0700 | [diff] [blame] | 555 | istate->cache_changed |= CE_ENTRY_REMOVED; |
Kjetil Barvik | 36419c8 | 2009-02-18 23:18:03 +0100 | [diff] [blame] | 556 | istate->cache_nr = j; |
| 557 | } |
| 558 | |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 559 | int remove_file_from_index(struct index_state *istate, const char *path) |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 560 | { |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 561 | int pos = index_name_pos(istate, path, strlen(path)); |
Junio C Hamano | c4e3cca | 2005-04-17 09:53:35 -0700 | [diff] [blame] | 562 | if (pos < 0) |
| 563 | pos = -pos-1; |
Nguyễn Thái Ngọc Duy | a5400ef | 2014-06-13 19:19:31 +0700 | [diff] [blame] | 564 | cache_tree_invalidate_path(istate, path); |
Nguyễn Thái Ngọc Duy | e931371 | 2015-03-08 17:12:35 +0700 | [diff] [blame] | 565 | untracked_cache_remove_from_index(istate, path); |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 566 | while (pos < istate->cache_nr && !strcmp(istate->cache[pos]->name, path)) |
| 567 | remove_index_entry_at(istate, pos); |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 568 | return 0; |
| 569 | } |
| 570 | |
Johannes Schindelin | 2031427 | 2007-06-29 18:32:46 +0100 | [diff] [blame] | 571 | static int compare_name(struct cache_entry *ce, const char *path, int namelen) |
| 572 | { |
| 573 | return namelen != ce_namelen(ce) || memcmp(path, ce->name, namelen); |
| 574 | } |
| 575 | |
| 576 | static int index_name_pos_also_unmerged(struct index_state *istate, |
| 577 | const char *path, int namelen) |
| 578 | { |
| 579 | int pos = index_name_pos(istate, path, namelen); |
| 580 | struct cache_entry *ce; |
| 581 | |
| 582 | if (pos >= 0) |
| 583 | return pos; |
| 584 | |
| 585 | /* maybe unmerged? */ |
| 586 | pos = -1 - pos; |
| 587 | if (pos >= istate->cache_nr || |
| 588 | compare_name((ce = istate->cache[pos]), path, namelen)) |
| 589 | return -1; |
| 590 | |
| 591 | /* order of preference: stage 2, 1, 3 */ |
| 592 | if (ce_stage(ce) == 1 && pos + 1 < istate->cache_nr && |
| 593 | ce_stage((ce = istate->cache[pos + 1])) == 2 && |
| 594 | !compare_name(ce, path, namelen)) |
| 595 | pos++; |
| 596 | return pos; |
| 597 | } |
| 598 | |
Linus Torvalds | 1102952 | 2008-03-22 14:22:44 -0700 | [diff] [blame] | 599 | static int different_name(struct cache_entry *ce, struct cache_entry *alias) |
| 600 | { |
| 601 | int len = ce_namelen(ce); |
| 602 | return ce_namelen(alias) != len || memcmp(ce->name, alias->name, len); |
| 603 | } |
| 604 | |
| 605 | /* |
| 606 | * If we add a filename that aliases in the cache, we will use the |
| 607 | * name that we already have - but we don't want to update the same |
| 608 | * alias twice, because that implies that there were actually two |
| 609 | * different files with aliasing names! |
| 610 | * |
| 611 | * So we use the CE_ADDED flag to verify that the alias was an old |
| 612 | * one before we accept it as |
| 613 | */ |
Nguyễn Thái Ngọc Duy | 045113a | 2014-06-13 19:19:38 +0700 | [diff] [blame] | 614 | static struct cache_entry *create_alias_ce(struct index_state *istate, |
| 615 | struct cache_entry *ce, |
| 616 | struct cache_entry *alias) |
Linus Torvalds | 1102952 | 2008-03-22 14:22:44 -0700 | [diff] [blame] | 617 | { |
| 618 | int len; |
Brandon Williams | 285c2e2 | 2018-02-14 10:59:45 -0800 | [diff] [blame] | 619 | struct cache_entry *new_entry; |
Linus Torvalds | 1102952 | 2008-03-22 14:22:44 -0700 | [diff] [blame] | 620 | |
| 621 | if (alias->ce_flags & CE_ADDED) |
| 622 | die("Will not add file alias '%s' ('%s' already exists in index)", ce->name, alias->name); |
| 623 | |
| 624 | /* Ok, create the new entry using the name of the existing alias */ |
| 625 | len = ce_namelen(alias); |
Brandon Williams | 285c2e2 | 2018-02-14 10:59:45 -0800 | [diff] [blame] | 626 | new_entry = xcalloc(1, cache_entry_size(len)); |
| 627 | memcpy(new_entry->name, alias->name, len); |
| 628 | copy_cache_entry(new_entry, ce); |
Nguyễn Thái Ngọc Duy | 045113a | 2014-06-13 19:19:38 +0700 | [diff] [blame] | 629 | save_or_free_index_entry(istate, ce); |
Brandon Williams | 285c2e2 | 2018-02-14 10:59:45 -0800 | [diff] [blame] | 630 | return new_entry; |
Linus Torvalds | 1102952 | 2008-03-22 14:22:44 -0700 | [diff] [blame] | 631 | } |
| 632 | |
Nguyễn Thái Ngọc Duy | b4b313f | 2014-02-04 09:20:09 +0700 | [diff] [blame] | 633 | void set_object_name_for_intent_to_add_entry(struct cache_entry *ce) |
Junio C Hamano | 3942581 | 2008-08-21 01:44:53 -0700 | [diff] [blame] | 634 | { |
Patryk Obara | a09c985 | 2018-01-28 01:13:19 +0100 | [diff] [blame] | 635 | struct object_id oid; |
| 636 | if (write_object_file("", 0, blob_type, &oid)) |
Junio C Hamano | 3942581 | 2008-08-21 01:44:53 -0700 | [diff] [blame] | 637 | die("cannot create an empty blob in the object database"); |
Patryk Obara | a09c985 | 2018-01-28 01:13:19 +0100 | [diff] [blame] | 638 | oidcpy(&ce->oid, &oid); |
Junio C Hamano | 3942581 | 2008-08-21 01:44:53 -0700 | [diff] [blame] | 639 | } |
| 640 | |
Thomas Gummerer | 610d55a | 2016-09-14 22:07:47 +0100 | [diff] [blame] | 641 | int add_to_index(struct index_state *istate, const char *path, struct stat *st, int flags) |
Johannes Schindelin | 11be42a | 2006-07-26 03:52:35 +0200 | [diff] [blame] | 642 | { |
Junio C Hamano | 38ed1d8 | 2008-05-21 12:04:34 -0700 | [diff] [blame] | 643 | int size, namelen, was_same; |
Linus Torvalds | d177cab | 2008-05-09 09:11:43 -0700 | [diff] [blame] | 644 | mode_t st_mode = st->st_mode; |
Torsten Bögershausen | 9472935 | 2017-11-16 17:38:28 +0100 | [diff] [blame] | 645 | struct cache_entry *ce, *alias = NULL; |
Nguyễn Thái Ngọc Duy | 56cac48 | 2009-12-14 18:43:58 +0700 | [diff] [blame] | 646 | unsigned ce_option = CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE|CE_MATCH_RACY_IS_DIRTY; |
Junio C Hamano | 38ed1d8 | 2008-05-21 12:04:34 -0700 | [diff] [blame] | 647 | int verbose = flags & (ADD_CACHE_VERBOSE | ADD_CACHE_PRETEND); |
| 648 | int pretend = flags & ADD_CACHE_PRETEND; |
Junio C Hamano | 3942581 | 2008-08-21 01:44:53 -0700 | [diff] [blame] | 649 | int intent_only = flags & ADD_CACHE_INTENT; |
| 650 | int add_option = (ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE| |
| 651 | (intent_only ? ADD_CACHE_NEW_ONLY : 0)); |
Torsten Bögershausen | 9472935 | 2017-11-16 17:38:28 +0100 | [diff] [blame] | 652 | int newflags = HASH_WRITE_OBJECT; |
| 653 | |
| 654 | if (flags & HASH_RENORMALIZE) |
| 655 | newflags |= HASH_RENORMALIZE; |
Johannes Schindelin | 11be42a | 2006-07-26 03:52:35 +0200 | [diff] [blame] | 656 | |
Linus Torvalds | d177cab | 2008-05-09 09:11:43 -0700 | [diff] [blame] | 657 | if (!S_ISREG(st_mode) && !S_ISLNK(st_mode) && !S_ISDIR(st_mode)) |
Alex Riesen | 960b8ad | 2008-05-12 19:57:45 +0200 | [diff] [blame] | 658 | return error("%s: can only add regular files, symbolic links or git-directories", path); |
Johannes Schindelin | 11be42a | 2006-07-26 03:52:35 +0200 | [diff] [blame] | 659 | |
| 660 | namelen = strlen(path); |
Linus Torvalds | d177cab | 2008-05-09 09:11:43 -0700 | [diff] [blame] | 661 | if (S_ISDIR(st_mode)) { |
Linus Torvalds | 0959525 | 2007-04-11 14:49:44 -0700 | [diff] [blame] | 662 | while (namelen && path[namelen-1] == '/') |
| 663 | namelen--; |
| 664 | } |
Johannes Schindelin | 11be42a | 2006-07-26 03:52:35 +0200 | [diff] [blame] | 665 | size = cache_entry_size(namelen); |
| 666 | ce = xcalloc(1, size); |
| 667 | memcpy(ce->name, path, namelen); |
Thomas Gummerer | b60e188 | 2012-07-11 11:22:37 +0200 | [diff] [blame] | 668 | ce->ce_namelen = namelen; |
Junio C Hamano | 3942581 | 2008-08-21 01:44:53 -0700 | [diff] [blame] | 669 | if (!intent_only) |
| 670 | fill_stat_cache_info(ce, st); |
Junio C Hamano | 388b2ac | 2008-11-28 19:55:25 -0800 | [diff] [blame] | 671 | else |
| 672 | ce->ce_flags |= CE_INTENT_TO_ADD; |
Johannes Schindelin | 11be42a | 2006-07-26 03:52:35 +0200 | [diff] [blame] | 673 | |
Thomas Gummerer | 610d55a | 2016-09-14 22:07:47 +0100 | [diff] [blame] | 674 | |
| 675 | if (trust_executable_bit && has_symlinks) { |
Linus Torvalds | d177cab | 2008-05-09 09:11:43 -0700 | [diff] [blame] | 676 | ce->ce_mode = create_ce_mode(st_mode); |
Thomas Gummerer | 610d55a | 2016-09-14 22:07:47 +0100 | [diff] [blame] | 677 | } else { |
Johannes Sixt | 78a8d64 | 2007-03-02 22:11:30 +0100 | [diff] [blame] | 678 | /* If there is an existing entry, pick the mode bits and type |
| 679 | * from it, otherwise assume unexecutable regular file. |
Johannes Schindelin | 11be42a | 2006-07-26 03:52:35 +0200 | [diff] [blame] | 680 | */ |
Junio C Hamano | 185c975 | 2007-02-16 22:43:48 -0800 | [diff] [blame] | 681 | struct cache_entry *ent; |
Johannes Schindelin | 2031427 | 2007-06-29 18:32:46 +0100 | [diff] [blame] | 682 | int pos = index_name_pos_also_unmerged(istate, path, namelen); |
Junio C Hamano | 185c975 | 2007-02-16 22:43:48 -0800 | [diff] [blame] | 683 | |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 684 | ent = (0 <= pos) ? istate->cache[pos] : NULL; |
Linus Torvalds | d177cab | 2008-05-09 09:11:43 -0700 | [diff] [blame] | 685 | ce->ce_mode = ce_mode_from_stat(ent, st_mode); |
Johannes Schindelin | 11be42a | 2006-07-26 03:52:35 +0200 | [diff] [blame] | 686 | } |
| 687 | |
Joshua Jensen | dc1ae70 | 2010-10-03 09:56:45 +0000 | [diff] [blame] | 688 | /* When core.ignorecase=true, determine if a directory of the same name but differing |
| 689 | * case already exists within the Git repository. If it does, ensure the directory |
| 690 | * case of the file being added to the repository matches (is folded into) the existing |
| 691 | * entry's directory case. |
| 692 | */ |
| 693 | if (ignore_case) { |
David Turner | 41284eb | 2015-10-21 13:54:11 -0400 | [diff] [blame] | 694 | adjust_dirname_case(istate, ce->name); |
Joshua Jensen | dc1ae70 | 2010-10-03 09:56:45 +0000 | [diff] [blame] | 695 | } |
Torsten Bögershausen | 9472935 | 2017-11-16 17:38:28 +0100 | [diff] [blame] | 696 | if (!(flags & HASH_RENORMALIZE)) { |
| 697 | alias = index_file_exists(istate, ce->name, |
| 698 | ce_namelen(ce), ignore_case); |
| 699 | if (alias && |
| 700 | !ce_stage(alias) && |
| 701 | !ie_match_stat(istate, alias, st, ce_option)) { |
| 702 | /* Nothing changed, really */ |
| 703 | if (!S_ISGITLINK(alias->ce_mode)) |
| 704 | ce_mark_uptodate(alias); |
| 705 | alias->ce_flags |= CE_ADDED; |
Joshua Jensen | dc1ae70 | 2010-10-03 09:56:45 +0000 | [diff] [blame] | 706 | |
Torsten Bögershausen | 9472935 | 2017-11-16 17:38:28 +0100 | [diff] [blame] | 707 | free(ce); |
| 708 | return 0; |
| 709 | } |
Junio C Hamano | 0781b8a | 2007-07-30 17:12:58 -0700 | [diff] [blame] | 710 | } |
Junio C Hamano | 3942581 | 2008-08-21 01:44:53 -0700 | [diff] [blame] | 711 | if (!intent_only) { |
Torsten Bögershausen | 9472935 | 2017-11-16 17:38:28 +0100 | [diff] [blame] | 712 | if (index_path(&ce->oid, path, st, newflags)) { |
Stefan Beller | 2d9426b | 2015-03-20 17:28:00 -0700 | [diff] [blame] | 713 | free(ce); |
Junio C Hamano | 3942581 | 2008-08-21 01:44:53 -0700 | [diff] [blame] | 714 | return error("unable to index file %s", path); |
Stefan Beller | 2d9426b | 2015-03-20 17:28:00 -0700 | [diff] [blame] | 715 | } |
Junio C Hamano | 3942581 | 2008-08-21 01:44:53 -0700 | [diff] [blame] | 716 | } else |
Nguyễn Thái Ngọc Duy | b4b313f | 2014-02-04 09:20:09 +0700 | [diff] [blame] | 717 | set_object_name_for_intent_to_add_entry(ce); |
Junio C Hamano | 3942581 | 2008-08-21 01:44:53 -0700 | [diff] [blame] | 718 | |
Linus Torvalds | 1102952 | 2008-03-22 14:22:44 -0700 | [diff] [blame] | 719 | if (ignore_case && alias && different_name(ce, alias)) |
Nguyễn Thái Ngọc Duy | 045113a | 2014-06-13 19:19:38 +0700 | [diff] [blame] | 720 | ce = create_alias_ce(istate, ce, alias); |
Linus Torvalds | 1102952 | 2008-03-22 14:22:44 -0700 | [diff] [blame] | 721 | ce->ce_flags |= CE_ADDED; |
Junio C Hamano | 38ed1d8 | 2008-05-21 12:04:34 -0700 | [diff] [blame] | 722 | |
Junio C Hamano | 3bf0dd1 | 2008-07-16 18:48:58 -0700 | [diff] [blame] | 723 | /* It was suspected to be racily clean, but it turns out to be Ok */ |
Junio C Hamano | 38ed1d8 | 2008-05-21 12:04:34 -0700 | [diff] [blame] | 724 | was_same = (alias && |
| 725 | !ce_stage(alias) && |
brian m. carlson | 99d1a98 | 2016-09-05 20:07:52 +0000 | [diff] [blame] | 726 | !oidcmp(&alias->oid, &ce->oid) && |
Junio C Hamano | 38ed1d8 | 2008-05-21 12:04:34 -0700 | [diff] [blame] | 727 | ce->ce_mode == alias->ce_mode); |
| 728 | |
| 729 | if (pretend) |
Junio C Hamano | 067178e | 2015-03-23 10:58:00 -0700 | [diff] [blame] | 730 | free(ce); |
| 731 | else if (add_index_entry(istate, ce, add_option)) { |
| 732 | free(ce); |
| 733 | return error("unable to add %s to index", path); |
| 734 | } |
Junio C Hamano | 38ed1d8 | 2008-05-21 12:04:34 -0700 | [diff] [blame] | 735 | if (verbose && !was_same) |
Johannes Schindelin | 11be42a | 2006-07-26 03:52:35 +0200 | [diff] [blame] | 736 | printf("add '%s'\n", path); |
Johannes Schindelin | 11be42a | 2006-07-26 03:52:35 +0200 | [diff] [blame] | 737 | return 0; |
| 738 | } |
| 739 | |
Thomas Gummerer | 610d55a | 2016-09-14 22:07:47 +0100 | [diff] [blame] | 740 | int add_file_to_index(struct index_state *istate, const char *path, int flags) |
Linus Torvalds | d177cab | 2008-05-09 09:11:43 -0700 | [diff] [blame] | 741 | { |
| 742 | struct stat st; |
| 743 | if (lstat(path, &st)) |
Thomas Rast | d824cbb | 2009-06-27 17:58:46 +0200 | [diff] [blame] | 744 | die_errno("unable to stat '%s'", path); |
Thomas Gummerer | 610d55a | 2016-09-14 22:07:47 +0100 | [diff] [blame] | 745 | return add_to_index(istate, path, &st, flags); |
Linus Torvalds | d177cab | 2008-05-09 09:11:43 -0700 | [diff] [blame] | 746 | } |
| 747 | |
Carlos Rica | 6640f88 | 2007-09-11 05:17:28 +0200 | [diff] [blame] | 748 | struct cache_entry *make_cache_entry(unsigned int mode, |
| 749 | const unsigned char *sha1, const char *path, int stage, |
Brad King | 2576272 | 2014-01-27 09:45:08 -0500 | [diff] [blame] | 750 | unsigned int refresh_options) |
Carlos Rica | 6640f88 | 2007-09-11 05:17:28 +0200 | [diff] [blame] | 751 | { |
| 752 | int size, len; |
Stefan Beller | bc1c2ca | 2015-02-17 10:06:14 -0800 | [diff] [blame] | 753 | struct cache_entry *ce, *ret; |
Carlos Rica | 6640f88 | 2007-09-11 05:17:28 +0200 | [diff] [blame] | 754 | |
Jeff King | 10ecfa7 | 2018-05-04 20:03:35 -0400 | [diff] [blame] | 755 | if (!verify_path(path, mode)) { |
Dmitry Potapov | 7e7abea | 2008-10-11 20:39:37 +0400 | [diff] [blame] | 756 | error("Invalid path '%s'", path); |
Carlos Rica | 6640f88 | 2007-09-11 05:17:28 +0200 | [diff] [blame] | 757 | return NULL; |
Dmitry Potapov | 7e7abea | 2008-10-11 20:39:37 +0400 | [diff] [blame] | 758 | } |
Carlos Rica | 6640f88 | 2007-09-11 05:17:28 +0200 | [diff] [blame] | 759 | |
| 760 | len = strlen(path); |
| 761 | size = cache_entry_size(len); |
| 762 | ce = xcalloc(1, size); |
| 763 | |
brian m. carlson | 99d1a98 | 2016-09-05 20:07:52 +0000 | [diff] [blame] | 764 | hashcpy(ce->oid.hash, sha1); |
Carlos Rica | 6640f88 | 2007-09-11 05:17:28 +0200 | [diff] [blame] | 765 | memcpy(ce->name, path, len); |
Thomas Gummerer | b60e188 | 2012-07-11 11:22:37 +0200 | [diff] [blame] | 766 | ce->ce_flags = create_ce_flags(stage); |
| 767 | ce->ce_namelen = len; |
Carlos Rica | 6640f88 | 2007-09-11 05:17:28 +0200 | [diff] [blame] | 768 | ce->ce_mode = create_ce_mode(mode); |
| 769 | |
Stefan Beller | bc1c2ca | 2015-02-17 10:06:14 -0800 | [diff] [blame] | 770 | ret = refresh_cache_entry(ce, refresh_options); |
Stefan Beller | 915e44c | 2015-03-23 10:57:11 -0700 | [diff] [blame] | 771 | if (ret != ce) |
Stefan Beller | bc1c2ca | 2015-02-17 10:06:14 -0800 | [diff] [blame] | 772 | free(ce); |
Stefan Beller | 915e44c | 2015-03-23 10:57:11 -0700 | [diff] [blame] | 773 | return ret; |
Carlos Rica | 6640f88 | 2007-09-11 05:17:28 +0200 | [diff] [blame] | 774 | } |
| 775 | |
Thomas Gummerer | d9d7096 | 2016-09-14 22:07:46 +0100 | [diff] [blame] | 776 | /* |
| 777 | * Chmod an index entry with either +x or -x. |
| 778 | * |
| 779 | * Returns -1 if the chmod for the particular cache entry failed (if it's |
| 780 | * not a regular file), -2 if an invalid flip argument is passed in, 0 |
| 781 | * otherwise. |
| 782 | */ |
| 783 | int chmod_index_entry(struct index_state *istate, struct cache_entry *ce, |
| 784 | char flip) |
| 785 | { |
| 786 | if (!S_ISREG(ce->ce_mode)) |
| 787 | return -1; |
| 788 | switch (flip) { |
| 789 | case '+': |
| 790 | ce->ce_mode |= 0111; |
| 791 | break; |
| 792 | case '-': |
| 793 | ce->ce_mode &= ~0111; |
| 794 | break; |
| 795 | default: |
| 796 | return -2; |
| 797 | } |
| 798 | cache_tree_invalidate_path(istate, ce->name); |
| 799 | ce->ce_flags |= CE_UPDATE_IN_BASE; |
Ben Peart | 883e248 | 2017-09-22 12:35:40 -0400 | [diff] [blame] | 800 | mark_fsmonitor_invalid(istate, ce); |
Thomas Gummerer | d9d7096 | 2016-09-14 22:07:46 +0100 | [diff] [blame] | 801 | istate->cache_changed |= CE_ENTRY_CHANGED; |
| 802 | |
| 803 | return 0; |
| 804 | } |
| 805 | |
Nguyễn Thái Ngọc Duy | 9c5e6c8 | 2013-07-09 22:29:00 +0700 | [diff] [blame] | 806 | int ce_same_name(const struct cache_entry *a, const struct cache_entry *b) |
Linus Torvalds | 7b937ca | 2005-04-16 12:05:45 -0700 | [diff] [blame] | 807 | { |
| 808 | int len = ce_namelen(a); |
| 809 | return ce_namelen(b) == len && !memcmp(a->name, b->name, len); |
| 810 | } |
| 811 | |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 812 | /* |
Linus Torvalds | 8dcf39c | 2006-05-18 12:07:31 -0700 | [diff] [blame] | 813 | * We fundamentally don't like some paths: we don't want |
| 814 | * dot or dot-dot anywhere, and for obvious reasons don't |
| 815 | * want to recurse into ".git" either. |
| 816 | * |
| 817 | * Also, we don't want double slashes or slashes at the |
| 818 | * end that can make pathnames ambiguous. |
| 819 | */ |
Jeff King | 10ecfa7 | 2018-05-04 20:03:35 -0400 | [diff] [blame] | 820 | static int verify_dotfile(const char *rest, unsigned mode) |
Linus Torvalds | 8dcf39c | 2006-05-18 12:07:31 -0700 | [diff] [blame] | 821 | { |
| 822 | /* |
| 823 | * The first character was '.', but that |
| 824 | * has already been discarded, we now test |
| 825 | * the rest. |
| 826 | */ |
Theo Niessink | e0f530f | 2011-06-08 14:04:41 +0200 | [diff] [blame] | 827 | |
Linus Torvalds | 8dcf39c | 2006-05-18 12:07:31 -0700 | [diff] [blame] | 828 | /* "." is not allowed */ |
Theo Niessink | e0f530f | 2011-06-08 14:04:41 +0200 | [diff] [blame] | 829 | if (*rest == '\0' || is_dir_sep(*rest)) |
Linus Torvalds | 8dcf39c | 2006-05-18 12:07:31 -0700 | [diff] [blame] | 830 | return 0; |
| 831 | |
Theo Niessink | e0f530f | 2011-06-08 14:04:41 +0200 | [diff] [blame] | 832 | switch (*rest) { |
Linus Torvalds | 8dcf39c | 2006-05-18 12:07:31 -0700 | [diff] [blame] | 833 | /* |
Jeff King | 641084b | 2018-05-15 09:56:50 -0400 | [diff] [blame] | 834 | * ".git" followed by NUL or slash is bad. Note that we match |
| 835 | * case-insensitively here, even if ignore_case is not set. |
| 836 | * This outlaws ".GIT" everywhere out of an abundance of caution, |
| 837 | * since there's really no good reason to allow it. |
Jeff King | 10ecfa7 | 2018-05-04 20:03:35 -0400 | [diff] [blame] | 838 | * |
| 839 | * Once we've seen ".git", we can also find ".gitmodules", etc (also |
| 840 | * case-insensitively). |
Linus Torvalds | 8dcf39c | 2006-05-18 12:07:31 -0700 | [diff] [blame] | 841 | */ |
| 842 | case 'g': |
Jeff King | cc2fc7c | 2014-11-24 13:39:12 -0500 | [diff] [blame] | 843 | case 'G': |
| 844 | if (rest[1] != 'i' && rest[1] != 'I') |
Linus Torvalds | 8dcf39c | 2006-05-18 12:07:31 -0700 | [diff] [blame] | 845 | break; |
Jeff King | cc2fc7c | 2014-11-24 13:39:12 -0500 | [diff] [blame] | 846 | if (rest[2] != 't' && rest[2] != 'T') |
Linus Torvalds | 8dcf39c | 2006-05-18 12:07:31 -0700 | [diff] [blame] | 847 | break; |
Jeff King | e19e5e6 | 2018-05-13 13:00:23 -0400 | [diff] [blame] | 848 | if (rest[3] == '\0' || is_dir_sep(rest[3])) |
| 849 | return 0; |
Jeff King | 10ecfa7 | 2018-05-04 20:03:35 -0400 | [diff] [blame] | 850 | if (S_ISLNK(mode)) { |
| 851 | rest += 3; |
| 852 | if (skip_iprefix(rest, "modules", &rest) && |
| 853 | (*rest == '\0' || is_dir_sep(*rest))) |
| 854 | return 0; |
| 855 | } |
Jeff King | e19e5e6 | 2018-05-13 13:00:23 -0400 | [diff] [blame] | 856 | break; |
Linus Torvalds | 8dcf39c | 2006-05-18 12:07:31 -0700 | [diff] [blame] | 857 | case '.': |
Theo Niessink | e0f530f | 2011-06-08 14:04:41 +0200 | [diff] [blame] | 858 | if (rest[1] == '\0' || is_dir_sep(rest[1])) |
Linus Torvalds | 8dcf39c | 2006-05-18 12:07:31 -0700 | [diff] [blame] | 859 | return 0; |
| 860 | } |
| 861 | return 1; |
| 862 | } |
| 863 | |
Jeff King | 10ecfa7 | 2018-05-04 20:03:35 -0400 | [diff] [blame] | 864 | int verify_path(const char *path, unsigned mode) |
Linus Torvalds | 8dcf39c | 2006-05-18 12:07:31 -0700 | [diff] [blame] | 865 | { |
| 866 | char c; |
| 867 | |
Erik Faye-Lund | 56948cb | 2011-05-27 18:00:40 +0200 | [diff] [blame] | 868 | if (has_dos_drive_prefix(path)) |
| 869 | return 0; |
| 870 | |
Linus Torvalds | 8dcf39c | 2006-05-18 12:07:31 -0700 | [diff] [blame] | 871 | goto inside; |
| 872 | for (;;) { |
| 873 | if (!c) |
| 874 | return 1; |
Erik Faye-Lund | 56948cb | 2011-05-27 18:00:40 +0200 | [diff] [blame] | 875 | if (is_dir_sep(c)) { |
Linus Torvalds | 8dcf39c | 2006-05-18 12:07:31 -0700 | [diff] [blame] | 876 | inside: |
Jeff King | 10ecfa7 | 2018-05-04 20:03:35 -0400 | [diff] [blame] | 877 | if (protect_hfs) { |
| 878 | if (is_hfs_dotgit(path)) |
| 879 | return 0; |
| 880 | if (S_ISLNK(mode)) { |
| 881 | if (is_hfs_dotgitmodules(path)) |
| 882 | return 0; |
| 883 | } |
| 884 | } |
| 885 | if (protect_ntfs) { |
| 886 | if (is_ntfs_dotgit(path)) |
| 887 | return 0; |
| 888 | if (S_ISLNK(mode)) { |
| 889 | if (is_ntfs_dotgitmodules(path)) |
| 890 | return 0; |
| 891 | } |
| 892 | } |
| 893 | |
Linus Torvalds | 8dcf39c | 2006-05-18 12:07:31 -0700 | [diff] [blame] | 894 | c = *path++; |
Jeff King | 10ecfa7 | 2018-05-04 20:03:35 -0400 | [diff] [blame] | 895 | if ((c == '.' && !verify_dotfile(path, mode)) || |
Junio C Hamano | 3bdf09c | 2011-06-06 20:49:06 -0700 | [diff] [blame] | 896 | is_dir_sep(c) || c == '\0') |
| 897 | return 0; |
Linus Torvalds | 8dcf39c | 2006-05-18 12:07:31 -0700 | [diff] [blame] | 898 | } |
| 899 | c = *path++; |
| 900 | } |
| 901 | } |
| 902 | |
| 903 | /* |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 904 | * Do we have another file that has the beginning components being a |
| 905 | * proper superset of the name we're trying to add? |
| 906 | */ |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 907 | static int has_file_name(struct index_state *istate, |
| 908 | const struct cache_entry *ce, int pos, int ok_to_replace) |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 909 | { |
| 910 | int retval = 0; |
| 911 | int len = ce_namelen(ce); |
Junio C Hamano | b155725 | 2005-06-25 02:25:29 -0700 | [diff] [blame] | 912 | int stage = ce_stage(ce); |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 913 | const char *name = ce->name; |
| 914 | |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 915 | while (pos < istate->cache_nr) { |
| 916 | struct cache_entry *p = istate->cache[pos++]; |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 917 | |
| 918 | if (len >= ce_namelen(p)) |
| 919 | break; |
| 920 | if (memcmp(name, p->name, len)) |
| 921 | break; |
Junio C Hamano | b155725 | 2005-06-25 02:25:29 -0700 | [diff] [blame] | 922 | if (ce_stage(p) != stage) |
| 923 | continue; |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 924 | if (p->name[len] != '/') |
| 925 | continue; |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 926 | if (p->ce_flags & CE_REMOVE) |
Junio C Hamano | 21cd8d0 | 2007-03-30 01:55:37 -0700 | [diff] [blame] | 927 | continue; |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 928 | retval = -1; |
| 929 | if (!ok_to_replace) |
| 930 | break; |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 931 | remove_index_entry_at(istate, --pos); |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 932 | } |
| 933 | return retval; |
| 934 | } |
| 935 | |
Jeff Hostetler | a6db3fb | 2017-04-14 19:12:28 +0000 | [diff] [blame] | 936 | |
| 937 | /* |
| 938 | * Like strcmp(), but also return the offset of the first change. |
| 939 | * If strings are equal, return the length. |
| 940 | */ |
| 941 | int strcmp_offset(const char *s1, const char *s2, size_t *first_change) |
| 942 | { |
| 943 | size_t k; |
| 944 | |
| 945 | if (!first_change) |
| 946 | return strcmp(s1, s2); |
| 947 | |
| 948 | for (k = 0; s1[k] == s2[k]; k++) |
| 949 | if (s1[k] == '\0') |
| 950 | break; |
| 951 | |
| 952 | *first_change = k; |
| 953 | return (unsigned char)s1[k] - (unsigned char)s2[k]; |
| 954 | } |
| 955 | |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 956 | /* |
| 957 | * Do we have another file with a pathname that is a proper |
| 958 | * subset of the name we're trying to add? |
Jeff Hostetler | 06b6d81 | 2017-04-19 17:06:17 +0000 | [diff] [blame] | 959 | * |
| 960 | * That is, is there another file in the index with a path |
| 961 | * that matches a sub-directory in the given entry? |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 962 | */ |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 963 | static int has_dir_name(struct index_state *istate, |
| 964 | const struct cache_entry *ce, int pos, int ok_to_replace) |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 965 | { |
| 966 | int retval = 0; |
Junio C Hamano | b155725 | 2005-06-25 02:25:29 -0700 | [diff] [blame] | 967 | int stage = ce_stage(ce); |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 968 | const char *name = ce->name; |
| 969 | const char *slash = name + ce_namelen(ce); |
Jeff Hostetler | 06b6d81 | 2017-04-19 17:06:17 +0000 | [diff] [blame] | 970 | size_t len_eq_last; |
| 971 | int cmp_last = 0; |
| 972 | |
| 973 | /* |
| 974 | * We are frequently called during an iteration on a sorted |
| 975 | * list of pathnames and while building a new index. Therefore, |
| 976 | * there is a high probability that this entry will eventually |
| 977 | * be appended to the index, rather than inserted in the middle. |
| 978 | * If we can confirm that, we can avoid binary searches on the |
| 979 | * components of the pathname. |
| 980 | * |
| 981 | * Compare the entry's full path with the last path in the index. |
| 982 | */ |
| 983 | if (istate->cache_nr > 0) { |
| 984 | cmp_last = strcmp_offset(name, |
| 985 | istate->cache[istate->cache_nr - 1]->name, |
| 986 | &len_eq_last); |
| 987 | if (cmp_last > 0) { |
| 988 | if (len_eq_last == 0) { |
| 989 | /* |
| 990 | * The entry sorts AFTER the last one in the |
| 991 | * index and their paths have no common prefix, |
| 992 | * so there cannot be a F/D conflict. |
| 993 | */ |
| 994 | return retval; |
| 995 | } else { |
| 996 | /* |
| 997 | * The entry sorts AFTER the last one in the |
| 998 | * index, but has a common prefix. Fall through |
| 999 | * to the loop below to disect the entry's path |
| 1000 | * and see where the difference is. |
| 1001 | */ |
| 1002 | } |
| 1003 | } else if (cmp_last == 0) { |
| 1004 | /* |
| 1005 | * The entry exactly matches the last one in the |
| 1006 | * index, but because of multiple stage and CE_REMOVE |
| 1007 | * items, we fall through and let the regular search |
| 1008 | * code handle it. |
| 1009 | */ |
| 1010 | } |
| 1011 | } |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 1012 | |
| 1013 | for (;;) { |
Jeff Hostetler | b986df5 | 2017-04-19 17:06:18 +0000 | [diff] [blame] | 1014 | size_t len; |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 1015 | |
| 1016 | for (;;) { |
| 1017 | if (*--slash == '/') |
| 1018 | break; |
| 1019 | if (slash <= ce->name) |
| 1020 | return retval; |
| 1021 | } |
| 1022 | len = slash - name; |
| 1023 | |
Jeff Hostetler | b986df5 | 2017-04-19 17:06:18 +0000 | [diff] [blame] | 1024 | if (cmp_last > 0) { |
| 1025 | /* |
| 1026 | * (len + 1) is a directory boundary (including |
| 1027 | * the trailing slash). And since the loop is |
| 1028 | * decrementing "slash", the first iteration is |
| 1029 | * the longest directory prefix; subsequent |
| 1030 | * iterations consider parent directories. |
| 1031 | */ |
| 1032 | |
| 1033 | if (len + 1 <= len_eq_last) { |
| 1034 | /* |
| 1035 | * The directory prefix (including the trailing |
| 1036 | * slash) also appears as a prefix in the last |
| 1037 | * entry, so the remainder cannot collide (because |
| 1038 | * strcmp said the whole path was greater). |
| 1039 | * |
| 1040 | * EQ: last: xxx/A |
| 1041 | * this: xxx/B |
| 1042 | * |
| 1043 | * LT: last: xxx/file_A |
| 1044 | * this: xxx/file_B |
| 1045 | */ |
| 1046 | return retval; |
| 1047 | } |
| 1048 | |
| 1049 | if (len > len_eq_last) { |
| 1050 | /* |
| 1051 | * This part of the directory prefix (excluding |
| 1052 | * the trailing slash) is longer than the known |
| 1053 | * equal portions, so this sub-directory cannot |
| 1054 | * collide with a file. |
| 1055 | * |
| 1056 | * GT: last: xxxA |
| 1057 | * this: xxxB/file |
| 1058 | */ |
| 1059 | return retval; |
| 1060 | } |
| 1061 | |
| 1062 | if (istate->cache_nr > 0 && |
| 1063 | ce_namelen(istate->cache[istate->cache_nr - 1]) > len) { |
| 1064 | /* |
| 1065 | * The directory prefix lines up with part of |
| 1066 | * a longer file or directory name, but sorts |
| 1067 | * after it, so this sub-directory cannot |
| 1068 | * collide with a file. |
| 1069 | * |
| 1070 | * last: xxx/yy-file (because '-' sorts before '/') |
| 1071 | * this: xxx/yy/abc |
| 1072 | */ |
| 1073 | return retval; |
| 1074 | } |
| 1075 | |
| 1076 | /* |
| 1077 | * This is a possible collision. Fall through and |
| 1078 | * let the regular search code handle it. |
| 1079 | * |
| 1080 | * last: xxx |
| 1081 | * this: xxx/file |
| 1082 | */ |
| 1083 | } |
| 1084 | |
Thomas Gummerer | b60e188 | 2012-07-11 11:22:37 +0200 | [diff] [blame] | 1085 | pos = index_name_stage_pos(istate, name, len, stage); |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 1086 | if (pos >= 0) { |
Junio C Hamano | 21cd8d0 | 2007-03-30 01:55:37 -0700 | [diff] [blame] | 1087 | /* |
| 1088 | * Found one, but not so fast. This could |
| 1089 | * be a marker that says "I was here, but |
| 1090 | * I am being removed". Such an entry is |
| 1091 | * not a part of the resulting tree, and |
| 1092 | * it is Ok to have a directory at the same |
| 1093 | * path. |
| 1094 | */ |
Junio C Hamano | 077c48d | 2008-01-22 21:24:21 -0800 | [diff] [blame] | 1095 | if (!(istate->cache[pos]->ce_flags & CE_REMOVE)) { |
Junio C Hamano | 21cd8d0 | 2007-03-30 01:55:37 -0700 | [diff] [blame] | 1096 | retval = -1; |
| 1097 | if (!ok_to_replace) |
| 1098 | break; |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1099 | remove_index_entry_at(istate, pos); |
Junio C Hamano | 21cd8d0 | 2007-03-30 01:55:37 -0700 | [diff] [blame] | 1100 | continue; |
| 1101 | } |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 1102 | } |
Junio C Hamano | 21cd8d0 | 2007-03-30 01:55:37 -0700 | [diff] [blame] | 1103 | else |
| 1104 | pos = -pos-1; |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 1105 | |
| 1106 | /* |
| 1107 | * Trivial optimization: if we find an entry that |
| 1108 | * already matches the sub-directory, then we know |
Junio C Hamano | b155725 | 2005-06-25 02:25:29 -0700 | [diff] [blame] | 1109 | * we're ok, and we can exit. |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 1110 | */ |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1111 | while (pos < istate->cache_nr) { |
| 1112 | struct cache_entry *p = istate->cache[pos]; |
Junio C Hamano | b155725 | 2005-06-25 02:25:29 -0700 | [diff] [blame] | 1113 | if ((ce_namelen(p) <= len) || |
| 1114 | (p->name[len] != '/') || |
| 1115 | memcmp(p->name, name, len)) |
| 1116 | break; /* not our subdirectory */ |
Junio C Hamano | 077c48d | 2008-01-22 21:24:21 -0800 | [diff] [blame] | 1117 | if (ce_stage(p) == stage && !(p->ce_flags & CE_REMOVE)) |
| 1118 | /* |
| 1119 | * p is at the same stage as our entry, and |
Junio C Hamano | b155725 | 2005-06-25 02:25:29 -0700 | [diff] [blame] | 1120 | * is a subdirectory of what we are looking |
| 1121 | * at, so we cannot have conflicts at our |
| 1122 | * level or anything shorter. |
| 1123 | */ |
| 1124 | return retval; |
| 1125 | pos++; |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 1126 | } |
| 1127 | } |
| 1128 | return retval; |
| 1129 | } |
| 1130 | |
Junio C Hamano | 0f1e4f0 | 2005-05-07 21:48:12 -0700 | [diff] [blame] | 1131 | /* We may be in a situation where we already have path/file and path |
| 1132 | * is being added, or we already have path and path/file is being |
| 1133 | * added. Either one would result in a nonsense tree that has path |
| 1134 | * twice when git-write-tree tries to write it out. Prevent it. |
Junio C Hamano | a6080a0 | 2007-06-07 00:04:01 -0700 | [diff] [blame] | 1135 | * |
Junio C Hamano | 192268c | 2005-05-07 21:55:21 -0700 | [diff] [blame] | 1136 | * If ok-to-replace is specified, we remove the conflicting entries |
| 1137 | * from the cache so the caller should recompute the insert position. |
| 1138 | * When this happens, we return non-zero. |
Junio C Hamano | 0f1e4f0 | 2005-05-07 21:48:12 -0700 | [diff] [blame] | 1139 | */ |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1140 | static int check_file_directory_conflict(struct index_state *istate, |
| 1141 | const struct cache_entry *ce, |
| 1142 | int pos, int ok_to_replace) |
Junio C Hamano | 0f1e4f0 | 2005-05-07 21:48:12 -0700 | [diff] [blame] | 1143 | { |
Junio C Hamano | 21cd8d0 | 2007-03-30 01:55:37 -0700 | [diff] [blame] | 1144 | int retval; |
| 1145 | |
| 1146 | /* |
| 1147 | * When ce is an "I am going away" entry, we allow it to be added |
| 1148 | */ |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1149 | if (ce->ce_flags & CE_REMOVE) |
Junio C Hamano | 21cd8d0 | 2007-03-30 01:55:37 -0700 | [diff] [blame] | 1150 | return 0; |
| 1151 | |
Junio C Hamano | 0f1e4f0 | 2005-05-07 21:48:12 -0700 | [diff] [blame] | 1152 | /* |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 1153 | * We check if the path is a sub-path of a subsequent pathname |
| 1154 | * first, since removing those will not change the position |
Junio C Hamano | 21cd8d0 | 2007-03-30 01:55:37 -0700 | [diff] [blame] | 1155 | * in the array. |
Junio C Hamano | 0f1e4f0 | 2005-05-07 21:48:12 -0700 | [diff] [blame] | 1156 | */ |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1157 | retval = has_file_name(istate, ce, pos, ok_to_replace); |
Junio C Hamano | 21cd8d0 | 2007-03-30 01:55:37 -0700 | [diff] [blame] | 1158 | |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 1159 | /* |
| 1160 | * Then check if the path might have a clashing sub-directory |
| 1161 | * before it. |
Junio C Hamano | 0f1e4f0 | 2005-05-07 21:48:12 -0700 | [diff] [blame] | 1162 | */ |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1163 | return retval + has_dir_name(istate, ce, pos, ok_to_replace); |
Junio C Hamano | 0f1e4f0 | 2005-05-07 21:48:12 -0700 | [diff] [blame] | 1164 | } |
| 1165 | |
Junio C Hamano | af3785d | 2007-08-09 13:42:50 -0700 | [diff] [blame] | 1166 | static int add_index_entry_with_check(struct index_state *istate, struct cache_entry *ce, int option) |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 1167 | { |
| 1168 | int pos; |
Junio C Hamano | 192268c | 2005-05-07 21:55:21 -0700 | [diff] [blame] | 1169 | int ok_to_add = option & ADD_CACHE_OK_TO_ADD; |
| 1170 | int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE; |
Junio C Hamano | b155725 | 2005-06-25 02:25:29 -0700 | [diff] [blame] | 1171 | int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK; |
Junio C Hamano | 3942581 | 2008-08-21 01:44:53 -0700 | [diff] [blame] | 1172 | int new_only = option & ADD_CACHE_NEW_ONLY; |
Junio C Hamano | 5f73076 | 2006-02-08 21:15:24 -0800 | [diff] [blame] | 1173 | |
Nguyễn Thái Ngọc Duy | ce7c614 | 2014-06-13 19:19:42 +0700 | [diff] [blame] | 1174 | if (!(option & ADD_CACHE_KEEP_CACHE_TREE)) |
| 1175 | cache_tree_invalidate_path(istate, ce->name); |
Jeff Hostetler | e549463 | 2017-04-19 17:06:16 +0000 | [diff] [blame] | 1176 | |
| 1177 | /* |
| 1178 | * If this entry's path sorts after the last entry in the index, |
| 1179 | * we can avoid searching for it. |
| 1180 | */ |
| 1181 | if (istate->cache_nr > 0 && |
| 1182 | strcmp(ce->name, istate->cache[istate->cache_nr - 1]->name) > 0) |
| 1183 | pos = -istate->cache_nr - 1; |
| 1184 | else |
| 1185 | pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce)); |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 1186 | |
Junio C Hamano | 3e09cdf | 2005-10-11 18:45:33 -0700 | [diff] [blame] | 1187 | /* existing match? Just replace it. */ |
Linus Torvalds | 76e7f4e | 2005-04-10 22:06:50 -0700 | [diff] [blame] | 1188 | if (pos >= 0) { |
Junio C Hamano | 3942581 | 2008-08-21 01:44:53 -0700 | [diff] [blame] | 1189 | if (!new_only) |
| 1190 | replace_index_entry(istate, pos, ce); |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 1191 | return 0; |
| 1192 | } |
Linus Torvalds | 76e7f4e | 2005-04-10 22:06:50 -0700 | [diff] [blame] | 1193 | pos = -pos-1; |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 1194 | |
Nguyễn Thái Ngọc Duy | ffcc9ba | 2015-06-07 17:40:52 +0700 | [diff] [blame] | 1195 | if (!(option & ADD_CACHE_KEEP_CACHE_TREE)) |
| 1196 | untracked_cache_add_to_index(istate, ce->name); |
Nguyễn Thái Ngọc Duy | e931371 | 2015-03-08 17:12:35 +0700 | [diff] [blame] | 1197 | |
Linus Torvalds | 7b937ca | 2005-04-16 12:05:45 -0700 | [diff] [blame] | 1198 | /* |
| 1199 | * Inserting a merged entry ("stage 0") into the index |
| 1200 | * will always replace all non-merged entries.. |
| 1201 | */ |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1202 | if (pos < istate->cache_nr && ce_stage(ce) == 0) { |
| 1203 | while (ce_same_name(istate->cache[pos], ce)) { |
Linus Torvalds | 7b937ca | 2005-04-16 12:05:45 -0700 | [diff] [blame] | 1204 | ok_to_add = 1; |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1205 | if (!remove_index_entry_at(istate, pos)) |
Linus Torvalds | 7b937ca | 2005-04-16 12:05:45 -0700 | [diff] [blame] | 1206 | break; |
| 1207 | } |
| 1208 | } |
| 1209 | |
Linus Torvalds | 121481a | 2005-04-10 11:32:54 -0700 | [diff] [blame] | 1210 | if (!ok_to_add) |
| 1211 | return -1; |
Jeff King | 10ecfa7 | 2018-05-04 20:03:35 -0400 | [diff] [blame] | 1212 | if (!verify_path(ce->name, ce->ce_mode)) |
Dmitry Potapov | 7e7abea | 2008-10-11 20:39:37 +0400 | [diff] [blame] | 1213 | return error("Invalid path '%s'", ce->name); |
Linus Torvalds | 121481a | 2005-04-10 11:32:54 -0700 | [diff] [blame] | 1214 | |
Junio C Hamano | 3e09cdf | 2005-10-11 18:45:33 -0700 | [diff] [blame] | 1215 | if (!skip_df_check && |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1216 | check_file_directory_conflict(istate, ce, pos, ok_to_replace)) { |
Junio C Hamano | 192268c | 2005-05-07 21:55:21 -0700 | [diff] [blame] | 1217 | if (!ok_to_replace) |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1218 | return error("'%s' appears as both a file and as a directory", |
| 1219 | ce->name); |
Thomas Gummerer | b60e188 | 2012-07-11 11:22:37 +0200 | [diff] [blame] | 1220 | pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce)); |
Junio C Hamano | 192268c | 2005-05-07 21:55:21 -0700 | [diff] [blame] | 1221 | pos = -pos-1; |
| 1222 | } |
Junio C Hamano | af3785d | 2007-08-09 13:42:50 -0700 | [diff] [blame] | 1223 | return pos + 1; |
| 1224 | } |
| 1225 | |
| 1226 | int add_index_entry(struct index_state *istate, struct cache_entry *ce, int option) |
| 1227 | { |
| 1228 | int pos; |
| 1229 | |
| 1230 | if (option & ADD_CACHE_JUST_APPEND) |
| 1231 | pos = istate->cache_nr; |
| 1232 | else { |
| 1233 | int ret; |
| 1234 | ret = add_index_entry_with_check(istate, ce, option); |
| 1235 | if (ret <= 0) |
| 1236 | return ret; |
| 1237 | pos = ret - 1; |
| 1238 | } |
Junio C Hamano | 0f1e4f0 | 2005-05-07 21:48:12 -0700 | [diff] [blame] | 1239 | |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 1240 | /* Make sure the array is big enough .. */ |
Dmitry S. Dolzhenko | 999f566 | 2014-03-04 02:32:01 +0400 | [diff] [blame] | 1241 | ALLOC_GROW(istate->cache, istate->cache_nr + 1, istate->cache_alloc); |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 1242 | |
| 1243 | /* Add it in.. */ |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1244 | istate->cache_nr++; |
Junio C Hamano | af3785d | 2007-08-09 13:42:50 -0700 | [diff] [blame] | 1245 | if (istate->cache_nr > pos + 1) |
SZEDER Gábor | f919ffe | 2018-01-22 18:50:09 +0100 | [diff] [blame] | 1246 | MOVE_ARRAY(istate->cache + pos + 1, istate->cache + pos, |
| 1247 | istate->cache_nr - pos - 1); |
Linus Torvalds | cf55870 | 2008-01-22 18:41:14 -0800 | [diff] [blame] | 1248 | set_index_entry(istate, pos, ce); |
Nguyễn Thái Ngọc Duy | e636a7b | 2014-06-13 19:19:27 +0700 | [diff] [blame] | 1249 | istate->cache_changed |= CE_ENTRY_ADDED; |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 1250 | return 0; |
| 1251 | } |
| 1252 | |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1253 | /* |
| 1254 | * "refresh" does not calculate a new sha1 file or bring the |
| 1255 | * cache up-to-date for mode/content changes. But what it |
| 1256 | * _does_ do is to "re-match" the stat information of a file |
| 1257 | * with the cache, so that you can refresh the cache for a |
| 1258 | * file that hasn't been changed but where the stat entry is |
| 1259 | * out of date. |
| 1260 | * |
| 1261 | * For example, you'd want to do this after doing a "git-read-tree", |
| 1262 | * to link up the stat cache details with the proper files. |
| 1263 | */ |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1264 | static struct cache_entry *refresh_cache_ent(struct index_state *istate, |
Junio C Hamano | 4bd5b7d | 2007-11-10 00:15:03 -0800 | [diff] [blame] | 1265 | struct cache_entry *ce, |
Jeff King | d05e697 | 2011-11-18 06:11:08 -0500 | [diff] [blame] | 1266 | unsigned int options, int *err, |
| 1267 | int *changed_ret) |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1268 | { |
| 1269 | struct stat st; |
| 1270 | struct cache_entry *updated; |
| 1271 | int changed, size; |
Brad King | 2576272 | 2014-01-27 09:45:08 -0500 | [diff] [blame] | 1272 | int refresh = options & CE_MATCH_REFRESH; |
Junio C Hamano | 4bd5b7d | 2007-11-10 00:15:03 -0800 | [diff] [blame] | 1273 | int ignore_valid = options & CE_MATCH_IGNORE_VALID; |
Nguyễn Thái Ngọc Duy | 56cac48 | 2009-12-14 18:43:58 +0700 | [diff] [blame] | 1274 | int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE; |
Brad King | 2e2e7ec | 2014-01-27 09:45:07 -0500 | [diff] [blame] | 1275 | int ignore_missing = options & CE_MATCH_IGNORE_MISSING; |
Ben Peart | 883e248 | 2017-09-22 12:35:40 -0400 | [diff] [blame] | 1276 | int ignore_fsmonitor = options & CE_MATCH_IGNORE_FSMONITOR; |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1277 | |
Brad King | 2576272 | 2014-01-27 09:45:08 -0500 | [diff] [blame] | 1278 | if (!refresh || ce_uptodate(ce)) |
Junio C Hamano | eadb583 | 2008-01-18 23:45:24 -0800 | [diff] [blame] | 1279 | return ce; |
| 1280 | |
Ben Peart | 883e248 | 2017-09-22 12:35:40 -0400 | [diff] [blame] | 1281 | if (!ignore_fsmonitor) |
| 1282 | refresh_fsmonitor(istate); |
Marius Storm-Olsen | aa9349d | 2008-05-30 14:38:35 +0200 | [diff] [blame] | 1283 | /* |
Nguyễn Thái Ngọc Duy | 56cac48 | 2009-12-14 18:43:58 +0700 | [diff] [blame] | 1284 | * CE_VALID or CE_SKIP_WORKTREE means the user promised us |
| 1285 | * that the change to the work tree does not matter and told |
| 1286 | * us not to worry. |
Marius Storm-Olsen | aa9349d | 2008-05-30 14:38:35 +0200 | [diff] [blame] | 1287 | */ |
Nguyễn Thái Ngọc Duy | 56cac48 | 2009-12-14 18:43:58 +0700 | [diff] [blame] | 1288 | if (!ignore_skip_worktree && ce_skip_worktree(ce)) { |
| 1289 | ce_mark_uptodate(ce); |
| 1290 | return ce; |
| 1291 | } |
Marius Storm-Olsen | aa9349d | 2008-05-30 14:38:35 +0200 | [diff] [blame] | 1292 | if (!ignore_valid && (ce->ce_flags & CE_VALID)) { |
| 1293 | ce_mark_uptodate(ce); |
| 1294 | return ce; |
| 1295 | } |
Ben Peart | 883e248 | 2017-09-22 12:35:40 -0400 | [diff] [blame] | 1296 | if (!ignore_fsmonitor && (ce->ce_flags & CE_FSMONITOR_VALID)) { |
| 1297 | ce_mark_uptodate(ce); |
| 1298 | return ce; |
| 1299 | } |
Marius Storm-Olsen | aa9349d | 2008-05-30 14:38:35 +0200 | [diff] [blame] | 1300 | |
René Scharfe | ccad42d | 2014-08-09 19:43:29 +0200 | [diff] [blame] | 1301 | if (has_symlink_leading_path(ce->name, ce_namelen(ce))) { |
| 1302 | if (ignore_missing) |
| 1303 | return ce; |
| 1304 | if (err) |
| 1305 | *err = ENOENT; |
| 1306 | return NULL; |
| 1307 | } |
| 1308 | |
Johannes Schindelin | 8fd2cb4 | 2006-07-25 21:32:18 -0700 | [diff] [blame] | 1309 | if (lstat(ce->name, &st) < 0) { |
Brad King | 2e2e7ec | 2014-01-27 09:45:07 -0500 | [diff] [blame] | 1310 | if (ignore_missing && errno == ENOENT) |
| 1311 | return ce; |
Junio C Hamano | ec0cc70 | 2007-04-01 21:34:34 -0700 | [diff] [blame] | 1312 | if (err) |
| 1313 | *err = errno; |
Johannes Schindelin | 8fd2cb4 | 2006-07-25 21:32:18 -0700 | [diff] [blame] | 1314 | return NULL; |
| 1315 | } |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1316 | |
Junio C Hamano | 4bd5b7d | 2007-11-10 00:15:03 -0800 | [diff] [blame] | 1317 | changed = ie_match_stat(istate, ce, &st, options); |
Jeff King | d05e697 | 2011-11-18 06:11:08 -0500 | [diff] [blame] | 1318 | if (changed_ret) |
| 1319 | *changed_ret = changed; |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1320 | if (!changed) { |
Junio C Hamano | 4bd5b7d | 2007-11-10 00:15:03 -0800 | [diff] [blame] | 1321 | /* |
| 1322 | * The path is unchanged. If we were told to ignore |
| 1323 | * valid bit, then we did the actual stat check and |
| 1324 | * found that the entry is unmodified. If the entry |
| 1325 | * is not marked VALID, this is the place to mark it |
| 1326 | * valid again, under "assume unchanged" mode. |
| 1327 | */ |
| 1328 | if (ignore_valid && assume_unchanged && |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1329 | !(ce->ce_flags & CE_VALID)) |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1330 | ; /* mark this one VALID again */ |
Junio C Hamano | eadb583 | 2008-01-18 23:45:24 -0800 | [diff] [blame] | 1331 | else { |
| 1332 | /* |
| 1333 | * We do not mark the index itself "modified" |
| 1334 | * because CE_UPTODATE flag is in-core only; |
| 1335 | * we are not going to write this change out. |
| 1336 | */ |
Ben Peart | 883e248 | 2017-09-22 12:35:40 -0400 | [diff] [blame] | 1337 | if (!S_ISGITLINK(ce->ce_mode)) { |
Junio C Hamano | 125fd98 | 2010-01-24 00:10:20 -0800 | [diff] [blame] | 1338 | ce_mark_uptodate(ce); |
Ben Peart | 883e248 | 2017-09-22 12:35:40 -0400 | [diff] [blame] | 1339 | mark_fsmonitor_valid(ce); |
| 1340 | } |
Johannes Schindelin | 8fd2cb4 | 2006-07-25 21:32:18 -0700 | [diff] [blame] | 1341 | return ce; |
Junio C Hamano | eadb583 | 2008-01-18 23:45:24 -0800 | [diff] [blame] | 1342 | } |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1343 | } |
| 1344 | |
Junio C Hamano | 4bd5b7d | 2007-11-10 00:15:03 -0800 | [diff] [blame] | 1345 | if (ie_modified(istate, ce, &st, options)) { |
Junio C Hamano | ec0cc70 | 2007-04-01 21:34:34 -0700 | [diff] [blame] | 1346 | if (err) |
| 1347 | *err = EINVAL; |
Johannes Schindelin | 8fd2cb4 | 2006-07-25 21:32:18 -0700 | [diff] [blame] | 1348 | return NULL; |
| 1349 | } |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1350 | |
| 1351 | size = ce_size(ce); |
| 1352 | updated = xmalloc(size); |
Ben Peart | 0e267b7 | 2018-03-15 11:25:20 -0400 | [diff] [blame] | 1353 | copy_cache_entry(updated, ce); |
| 1354 | memcpy(updated->name, ce->name, ce->ce_namelen + 1); |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1355 | fill_stat_cache_info(updated, &st); |
Junio C Hamano | 4bd5b7d | 2007-11-10 00:15:03 -0800 | [diff] [blame] | 1356 | /* |
| 1357 | * If ignore_valid is not set, we should leave CE_VALID bit |
| 1358 | * alone. Otherwise, paths marked with --no-assume-unchanged |
| 1359 | * (i.e. things to be edited) will reacquire CE_VALID bit |
| 1360 | * automatically, which is not really what we want. |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1361 | */ |
Junio C Hamano | 4bd5b7d | 2007-11-10 00:15:03 -0800 | [diff] [blame] | 1362 | if (!ignore_valid && assume_unchanged && |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1363 | !(ce->ce_flags & CE_VALID)) |
| 1364 | updated->ce_flags &= ~CE_VALID; |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1365 | |
Nguyễn Thái Ngọc Duy | e636a7b | 2014-06-13 19:19:27 +0700 | [diff] [blame] | 1366 | /* istate->cache_changed is updated in the caller */ |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1367 | return updated; |
| 1368 | } |
| 1369 | |
Matthieu Moy | 3deffc5 | 2009-08-21 10:57:59 +0200 | [diff] [blame] | 1370 | static void show_file(const char * fmt, const char * name, int in_porcelain, |
Jonathan Nieder | 046613c | 2011-02-22 22:43:23 +0000 | [diff] [blame] | 1371 | int * first, const char *header_msg) |
Matthieu Moy | 3deffc5 | 2009-08-21 10:57:59 +0200 | [diff] [blame] | 1372 | { |
| 1373 | if (in_porcelain && *first && header_msg) { |
| 1374 | printf("%s\n", header_msg); |
Junio C Hamano | cd2b8ae | 2011-08-25 14:46:52 -0700 | [diff] [blame] | 1375 | *first = 0; |
Matthieu Moy | 3deffc5 | 2009-08-21 10:57:59 +0200 | [diff] [blame] | 1376 | } |
| 1377 | printf(fmt, name); |
| 1378 | } |
| 1379 | |
Nguyễn Thái Ngọc Duy | 9b2d614 | 2013-07-14 15:35:54 +0700 | [diff] [blame] | 1380 | int refresh_index(struct index_state *istate, unsigned int flags, |
| 1381 | const struct pathspec *pathspec, |
Jonathan Nieder | 046613c | 2011-02-22 22:43:23 +0000 | [diff] [blame] | 1382 | char *seen, const char *header_msg) |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1383 | { |
| 1384 | int i; |
| 1385 | int has_errors = 0; |
| 1386 | int really = (flags & REFRESH_REALLY) != 0; |
| 1387 | int allow_unmerged = (flags & REFRESH_UNMERGED) != 0; |
| 1388 | int quiet = (flags & REFRESH_QUIET) != 0; |
| 1389 | int not_new = (flags & REFRESH_IGNORE_MISSING) != 0; |
Johannes Schindelin | 5fdeacb | 2008-05-14 18:03:45 +0100 | [diff] [blame] | 1390 | int ignore_submodules = (flags & REFRESH_IGNORE_SUBMODULES) != 0; |
Matthieu Moy | 3deffc5 | 2009-08-21 10:57:59 +0200 | [diff] [blame] | 1391 | int first = 1; |
| 1392 | int in_porcelain = (flags & REFRESH_IN_PORCELAIN); |
Brad King | 2576272 | 2014-01-27 09:45:08 -0500 | [diff] [blame] | 1393 | unsigned int options = (CE_MATCH_REFRESH | |
| 1394 | (really ? CE_MATCH_IGNORE_VALID : 0) | |
Brad King | 2e2e7ec | 2014-01-27 09:45:07 -0500 | [diff] [blame] | 1395 | (not_new ? CE_MATCH_IGNORE_MISSING : 0)); |
Jeff King | 4bd4e73 | 2011-11-18 06:11:28 -0500 | [diff] [blame] | 1396 | const char *modified_fmt; |
Jeff King | 73b7eae | 2011-11-18 06:13:08 -0500 | [diff] [blame] | 1397 | const char *deleted_fmt; |
| 1398 | const char *typechange_fmt; |
| 1399 | const char *added_fmt; |
Jeff King | 4bd4e73 | 2011-11-18 06:11:28 -0500 | [diff] [blame] | 1400 | const char *unmerged_fmt; |
Nguyễn Thái Ngọc Duy | ca54d9b | 2018-01-27 19:27:56 +0700 | [diff] [blame] | 1401 | uint64_t start = getnanotime(); |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1402 | |
Jeff King | 4bd4e73 | 2011-11-18 06:11:28 -0500 | [diff] [blame] | 1403 | modified_fmt = (in_porcelain ? "M\t%s\n" : "%s: needs update\n"); |
Jeff King | 73b7eae | 2011-11-18 06:13:08 -0500 | [diff] [blame] | 1404 | deleted_fmt = (in_porcelain ? "D\t%s\n" : "%s: needs update\n"); |
| 1405 | typechange_fmt = (in_porcelain ? "T\t%s\n" : "%s needs update\n"); |
| 1406 | added_fmt = (in_porcelain ? "A\t%s\n" : "%s needs update\n"); |
Jeff King | 4bd4e73 | 2011-11-18 06:11:28 -0500 | [diff] [blame] | 1407 | unmerged_fmt = (in_porcelain ? "U\t%s\n" : "%s: needs merge\n"); |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1408 | for (i = 0; i < istate->cache_nr; i++) { |
Brandon Williams | 285c2e2 | 2018-02-14 10:59:45 -0800 | [diff] [blame] | 1409 | struct cache_entry *ce, *new_entry; |
Junio C Hamano | ec0cc70 | 2007-04-01 21:34:34 -0700 | [diff] [blame] | 1410 | int cache_errno = 0; |
Jeff King | 73b7eae | 2011-11-18 06:13:08 -0500 | [diff] [blame] | 1411 | int changed = 0; |
Junio C Hamano | 3d1f148 | 2012-02-17 10:11:05 -0800 | [diff] [blame] | 1412 | int filtered = 0; |
Junio C Hamano | ec0cc70 | 2007-04-01 21:34:34 -0700 | [diff] [blame] | 1413 | |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1414 | ce = istate->cache[i]; |
Johannes Schindelin | 5fdeacb | 2008-05-14 18:03:45 +0100 | [diff] [blame] | 1415 | if (ignore_submodules && S_ISGITLINK(ce->ce_mode)) |
| 1416 | continue; |
| 1417 | |
Nguyễn Thái Ngọc Duy | 429bb40 | 2014-01-24 20:40:28 +0700 | [diff] [blame] | 1418 | if (pathspec && !ce_path_match(ce, pathspec, seen)) |
Junio C Hamano | 3d1f148 | 2012-02-17 10:11:05 -0800 | [diff] [blame] | 1419 | filtered = 1; |
| 1420 | |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1421 | if (ce_stage(ce)) { |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1422 | while ((i < istate->cache_nr) && |
| 1423 | ! strcmp(istate->cache[i]->name, ce->name)) |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1424 | i++; |
| 1425 | i--; |
| 1426 | if (allow_unmerged) |
| 1427 | continue; |
Junio C Hamano | 3d1f148 | 2012-02-17 10:11:05 -0800 | [diff] [blame] | 1428 | if (!filtered) |
| 1429 | show_file(unmerged_fmt, ce->name, in_porcelain, |
| 1430 | &first, header_msg); |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1431 | has_errors = 1; |
| 1432 | continue; |
| 1433 | } |
| 1434 | |
Junio C Hamano | 3d1f148 | 2012-02-17 10:11:05 -0800 | [diff] [blame] | 1435 | if (filtered) |
Alexandre Julliard | d616813 | 2007-08-11 23:59:01 +0200 | [diff] [blame] | 1436 | continue; |
| 1437 | |
Brandon Williams | 285c2e2 | 2018-02-14 10:59:45 -0800 | [diff] [blame] | 1438 | new_entry = refresh_cache_ent(istate, ce, options, &cache_errno, &changed); |
| 1439 | if (new_entry == ce) |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1440 | continue; |
Brandon Williams | 285c2e2 | 2018-02-14 10:59:45 -0800 | [diff] [blame] | 1441 | if (!new_entry) { |
Jeff King | 73b7eae | 2011-11-18 06:13:08 -0500 | [diff] [blame] | 1442 | const char *fmt; |
| 1443 | |
Johannes Schindelin | 8fd2cb4 | 2006-07-25 21:32:18 -0700 | [diff] [blame] | 1444 | if (really && cache_errno == EINVAL) { |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1445 | /* If we are doing --really-refresh that |
| 1446 | * means the index is not valid anymore. |
| 1447 | */ |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1448 | ce->ce_flags &= ~CE_VALID; |
Nguyễn Thái Ngọc Duy | 078a58e | 2014-06-13 19:19:39 +0700 | [diff] [blame] | 1449 | ce->ce_flags |= CE_UPDATE_IN_BASE; |
Ben Peart | 883e248 | 2017-09-22 12:35:40 -0400 | [diff] [blame] | 1450 | mark_fsmonitor_invalid(istate, ce); |
Nguyễn Thái Ngọc Duy | e636a7b | 2014-06-13 19:19:27 +0700 | [diff] [blame] | 1451 | istate->cache_changed |= CE_ENTRY_CHANGED; |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1452 | } |
| 1453 | if (quiet) |
| 1454 | continue; |
Jeff King | 73b7eae | 2011-11-18 06:13:08 -0500 | [diff] [blame] | 1455 | |
| 1456 | if (cache_errno == ENOENT) |
| 1457 | fmt = deleted_fmt; |
Nguyễn Thái Ngọc Duy | 895ff3b | 2015-08-22 08:08:05 +0700 | [diff] [blame] | 1458 | else if (ce_intent_to_add(ce)) |
Jeff King | 73b7eae | 2011-11-18 06:13:08 -0500 | [diff] [blame] | 1459 | fmt = added_fmt; /* must be before other checks */ |
| 1460 | else if (changed & TYPE_CHANGED) |
| 1461 | fmt = typechange_fmt; |
| 1462 | else |
| 1463 | fmt = modified_fmt; |
| 1464 | show_file(fmt, |
| 1465 | ce->name, in_porcelain, &first, header_msg); |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1466 | has_errors = 1; |
| 1467 | continue; |
| 1468 | } |
Linus Torvalds | cf55870 | 2008-01-22 18:41:14 -0800 | [diff] [blame] | 1469 | |
Brandon Williams | 285c2e2 | 2018-02-14 10:59:45 -0800 | [diff] [blame] | 1470 | replace_index_entry(istate, i, new_entry); |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1471 | } |
Nguyễn Thái Ngọc Duy | ca54d9b | 2018-01-27 19:27:56 +0700 | [diff] [blame] | 1472 | trace_performance_since(start, "refresh index"); |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1473 | return has_errors; |
| 1474 | } |
| 1475 | |
Junio C Hamano | 1335d76 | 2016-07-08 10:59:15 -0700 | [diff] [blame] | 1476 | struct cache_entry *refresh_cache_entry(struct cache_entry *ce, |
Brad King | 2576272 | 2014-01-27 09:45:08 -0500 | [diff] [blame] | 1477 | unsigned int options) |
Junio C Hamano | ec0cc70 | 2007-04-01 21:34:34 -0700 | [diff] [blame] | 1478 | { |
Brad King | 2576272 | 2014-01-27 09:45:08 -0500 | [diff] [blame] | 1479 | return refresh_cache_ent(&the_index, ce, options, NULL, NULL); |
Junio C Hamano | ec0cc70 | 2007-04-01 21:34:34 -0700 | [diff] [blame] | 1480 | } |
| 1481 | |
Junio C Hamano | db3b313 | 2012-04-03 15:53:09 -0700 | [diff] [blame] | 1482 | |
| 1483 | /***************************************************************** |
| 1484 | * Index File I/O |
| 1485 | *****************************************************************/ |
| 1486 | |
Junio C Hamano | 9d22778 | 2012-04-04 09:12:43 -0700 | [diff] [blame] | 1487 | #define INDEX_FORMAT_DEFAULT 3 |
| 1488 | |
Thomas Gummerer | 136347d | 2014-02-23 21:49:57 +0100 | [diff] [blame] | 1489 | static unsigned int get_index_format_default(void) |
| 1490 | { |
| 1491 | char *envversion = getenv("GIT_INDEX_VERSION"); |
Thomas Gummerer | 3c09d68 | 2014-02-23 21:49:59 +0100 | [diff] [blame] | 1492 | char *endp; |
Tanay Abhra | b27a572 | 2014-08-07 09:21:18 -0700 | [diff] [blame] | 1493 | int value; |
Thomas Gummerer | 3c09d68 | 2014-02-23 21:49:59 +0100 | [diff] [blame] | 1494 | unsigned int version = INDEX_FORMAT_DEFAULT; |
Thomas Gummerer | 136347d | 2014-02-23 21:49:57 +0100 | [diff] [blame] | 1495 | |
Thomas Gummerer | 3c09d68 | 2014-02-23 21:49:59 +0100 | [diff] [blame] | 1496 | if (!envversion) { |
Tanay Abhra | b27a572 | 2014-08-07 09:21:18 -0700 | [diff] [blame] | 1497 | if (!git_config_get_int("index.version", &value)) |
| 1498 | version = value; |
Thomas Gummerer | 3c09d68 | 2014-02-23 21:49:59 +0100 | [diff] [blame] | 1499 | if (version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) { |
| 1500 | warning(_("index.version set, but the value is invalid.\n" |
Thomas Gummerer | 136347d | 2014-02-23 21:49:57 +0100 | [diff] [blame] | 1501 | "Using version %i"), INDEX_FORMAT_DEFAULT); |
Thomas Gummerer | 3c09d68 | 2014-02-23 21:49:59 +0100 | [diff] [blame] | 1502 | return INDEX_FORMAT_DEFAULT; |
Thomas Gummerer | 136347d | 2014-02-23 21:49:57 +0100 | [diff] [blame] | 1503 | } |
| 1504 | return version; |
| 1505 | } |
Thomas Gummerer | 3c09d68 | 2014-02-23 21:49:59 +0100 | [diff] [blame] | 1506 | |
| 1507 | version = strtoul(envversion, &endp, 10); |
| 1508 | if (*endp || |
| 1509 | version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) { |
| 1510 | warning(_("GIT_INDEX_VERSION set, but the value is invalid.\n" |
| 1511 | "Using version %i"), INDEX_FORMAT_DEFAULT); |
| 1512 | version = INDEX_FORMAT_DEFAULT; |
| 1513 | } |
| 1514 | return version; |
Thomas Gummerer | 136347d | 2014-02-23 21:49:57 +0100 | [diff] [blame] | 1515 | } |
| 1516 | |
Junio C Hamano | db3b313 | 2012-04-03 15:53:09 -0700 | [diff] [blame] | 1517 | /* |
| 1518 | * dev/ino/uid/gid/size are also just tracked to the low 32 bits |
| 1519 | * Again - this is just a (very strong in practice) heuristic that |
| 1520 | * the inode hasn't changed. |
| 1521 | * |
| 1522 | * We save the fields in big-endian order to allow using the |
| 1523 | * index file over NFS transparently. |
| 1524 | */ |
| 1525 | struct ondisk_cache_entry { |
| 1526 | struct cache_time ctime; |
| 1527 | struct cache_time mtime; |
Thomas Gummerer | 7800c1e | 2013-08-18 21:41:51 +0200 | [diff] [blame] | 1528 | uint32_t dev; |
| 1529 | uint32_t ino; |
| 1530 | uint32_t mode; |
| 1531 | uint32_t uid; |
| 1532 | uint32_t gid; |
| 1533 | uint32_t size; |
Junio C Hamano | db3b313 | 2012-04-03 15:53:09 -0700 | [diff] [blame] | 1534 | unsigned char sha1[20]; |
Thomas Gummerer | 7800c1e | 2013-08-18 21:41:51 +0200 | [diff] [blame] | 1535 | uint16_t flags; |
Junio C Hamano | db3b313 | 2012-04-03 15:53:09 -0700 | [diff] [blame] | 1536 | char name[FLEX_ARRAY]; /* more */ |
| 1537 | }; |
| 1538 | |
| 1539 | /* |
| 1540 | * This struct is used when CE_EXTENDED bit is 1 |
| 1541 | * The struct must match ondisk_cache_entry exactly from |
| 1542 | * ctime till flags |
| 1543 | */ |
| 1544 | struct ondisk_cache_entry_extended { |
| 1545 | struct cache_time ctime; |
| 1546 | struct cache_time mtime; |
Thomas Gummerer | 7800c1e | 2013-08-18 21:41:51 +0200 | [diff] [blame] | 1547 | uint32_t dev; |
| 1548 | uint32_t ino; |
| 1549 | uint32_t mode; |
| 1550 | uint32_t uid; |
| 1551 | uint32_t gid; |
| 1552 | uint32_t size; |
Junio C Hamano | db3b313 | 2012-04-03 15:53:09 -0700 | [diff] [blame] | 1553 | unsigned char sha1[20]; |
Thomas Gummerer | 7800c1e | 2013-08-18 21:41:51 +0200 | [diff] [blame] | 1554 | uint16_t flags; |
| 1555 | uint16_t flags2; |
Junio C Hamano | db3b313 | 2012-04-03 15:53:09 -0700 | [diff] [blame] | 1556 | char name[FLEX_ARRAY]; /* more */ |
| 1557 | }; |
| 1558 | |
Junio C Hamano | 6c9cd16 | 2012-04-03 15:53:15 -0700 | [diff] [blame] | 1559 | /* These are only used for v3 or lower */ |
Kevin Willford | ce012de | 2017-08-21 15:24:32 -0600 | [diff] [blame] | 1560 | #define align_padding_size(size, len) ((size + (len) + 8) & ~7) - (size + len) |
Junio C Hamano | db3b313 | 2012-04-03 15:53:09 -0700 | [diff] [blame] | 1561 | #define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,name) + (len) + 8) & ~7) |
| 1562 | #define ondisk_cache_entry_size(len) align_flex_name(ondisk_cache_entry,len) |
| 1563 | #define ondisk_cache_entry_extended_size(len) align_flex_name(ondisk_cache_entry_extended,len) |
| 1564 | #define ondisk_ce_size(ce) (((ce)->ce_flags & CE_EXTENDED) ? \ |
| 1565 | ondisk_cache_entry_extended_size(ce_namelen(ce)) : \ |
| 1566 | ondisk_cache_entry_size(ce_namelen(ce))) |
| 1567 | |
Jeff Hostetler | a33fc72 | 2017-04-14 20:32:21 +0000 | [diff] [blame] | 1568 | /* Allow fsck to force verification of the index checksum. */ |
| 1569 | int verify_index_checksum; |
| 1570 | |
Ben Peart | 00ec50e | 2017-10-18 10:27:25 -0400 | [diff] [blame] | 1571 | /* Allow fsck to force verification of the cache entry order. */ |
| 1572 | int verify_ce_order; |
| 1573 | |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 1574 | static int verify_hdr(struct cache_header *hdr, unsigned long size) |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1575 | { |
brian m. carlson | aab6135 | 2018-02-01 02:18:45 +0000 | [diff] [blame] | 1576 | git_hash_ctx c; |
| 1577 | unsigned char hash[GIT_MAX_RAWSZ]; |
Junio C Hamano | 0136bac | 2012-04-03 15:53:12 -0700 | [diff] [blame] | 1578 | int hdr_version; |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1579 | |
Linus Torvalds | ccc4feb | 2005-04-15 10:44:27 -0700 | [diff] [blame] | 1580 | if (hdr->hdr_signature != htonl(CACHE_SIGNATURE)) |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1581 | return error("bad signature"); |
Junio C Hamano | 0136bac | 2012-04-03 15:53:12 -0700 | [diff] [blame] | 1582 | hdr_version = ntohl(hdr->hdr_version); |
Nguyễn Thái Ngọc Duy | b82a7b5 | 2013-02-22 19:09:24 +0700 | [diff] [blame] | 1583 | if (hdr_version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < hdr_version) |
Junio C Hamano | 0136bac | 2012-04-03 15:53:12 -0700 | [diff] [blame] | 1584 | return error("bad index version %d", hdr_version); |
Jeff Hostetler | a33fc72 | 2017-04-14 20:32:21 +0000 | [diff] [blame] | 1585 | |
| 1586 | if (!verify_index_checksum) |
| 1587 | return 0; |
| 1588 | |
brian m. carlson | aab6135 | 2018-02-01 02:18:45 +0000 | [diff] [blame] | 1589 | the_hash_algo->init_fn(&c); |
| 1590 | the_hash_algo->update_fn(&c, hdr, size - the_hash_algo->rawsz); |
| 1591 | the_hash_algo->final_fn(hash, &c); |
| 1592 | if (hashcmp(hash, (unsigned char *)hdr + size - the_hash_algo->rawsz)) |
Linus Torvalds | ca9be05 | 2005-04-20 12:36:41 -0700 | [diff] [blame] | 1593 | return error("bad index file sha1 signature"); |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1594 | return 0; |
| 1595 | } |
| 1596 | |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1597 | static int read_index_extension(struct index_state *istate, |
| 1598 | const char *ext, void *data, unsigned long sz) |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 1599 | { |
| 1600 | switch (CACHE_EXT(ext)) { |
| 1601 | case CACHE_EXT_TREE: |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1602 | istate->cache_tree = cache_tree_read(data, sz); |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 1603 | break; |
Junio C Hamano | cfc5789 | 2009-12-25 00:30:51 -0800 | [diff] [blame] | 1604 | case CACHE_EXT_RESOLVE_UNDO: |
| 1605 | istate->resolve_undo = resolve_undo_read(data, sz); |
| 1606 | break; |
Nguyễn Thái Ngọc Duy | 5fc2fc8 | 2014-06-13 19:19:36 +0700 | [diff] [blame] | 1607 | case CACHE_EXT_LINK: |
| 1608 | if (read_link_extension(istate, data, sz)) |
| 1609 | return -1; |
| 1610 | break; |
Nguyễn Thái Ngọc Duy | f9e6c64 | 2015-03-08 17:12:34 +0700 | [diff] [blame] | 1611 | case CACHE_EXT_UNTRACKED: |
| 1612 | istate->untracked = read_untracked_extension(data, sz); |
| 1613 | break; |
Ben Peart | 883e248 | 2017-09-22 12:35:40 -0400 | [diff] [blame] | 1614 | case CACHE_EXT_FSMONITOR: |
| 1615 | read_fsmonitor_extension(istate, data, sz); |
| 1616 | break; |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 1617 | default: |
| 1618 | if (*ext < 'A' || 'Z' < *ext) |
| 1619 | return error("index uses %.4s extension, which we do not understand", |
| 1620 | ext); |
| 1621 | fprintf(stderr, "ignoring %.4s extension\n", ext); |
| 1622 | break; |
| 1623 | } |
| 1624 | return 0; |
| 1625 | } |
| 1626 | |
Junio C Hamano | b3e83cc | 2016-12-07 10:33:54 -0800 | [diff] [blame] | 1627 | int hold_locked_index(struct lock_file *lk, int lock_flags) |
Michael Haggerty | 216aab1 | 2014-10-01 12:28:41 +0200 | [diff] [blame] | 1628 | { |
Junio C Hamano | b3e83cc | 2016-12-07 10:33:54 -0800 | [diff] [blame] | 1629 | return hold_lock_file_for_update(lk, get_index_file(), lock_flags); |
Michael Haggerty | 216aab1 | 2014-10-01 12:28:41 +0200 | [diff] [blame] | 1630 | } |
| 1631 | |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1632 | int read_index(struct index_state *istate) |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1633 | { |
Thomas Gummerer | a125a22 | 2018-01-07 22:30:13 +0000 | [diff] [blame] | 1634 | return read_index_from(istate, get_index_file(), get_git_dir()); |
Johannes Schindelin | 8fd2cb4 | 2006-07-25 21:32:18 -0700 | [diff] [blame] | 1635 | } |
| 1636 | |
Junio C Hamano | 3fc22b5 | 2012-04-03 15:53:13 -0700 | [diff] [blame] | 1637 | static struct cache_entry *cache_entry_from_ondisk(struct ondisk_cache_entry *ondisk, |
| 1638 | unsigned int flags, |
| 1639 | const char *name, |
| 1640 | size_t len) |
| 1641 | { |
| 1642 | struct cache_entry *ce = xmalloc(cache_entry_size(len)); |
| 1643 | |
Jeff King | c3d8da5 | 2014-01-23 16:26:42 -0500 | [diff] [blame] | 1644 | ce->ce_stat_data.sd_ctime.sec = get_be32(&ondisk->ctime.sec); |
| 1645 | ce->ce_stat_data.sd_mtime.sec = get_be32(&ondisk->mtime.sec); |
| 1646 | ce->ce_stat_data.sd_ctime.nsec = get_be32(&ondisk->ctime.nsec); |
| 1647 | ce->ce_stat_data.sd_mtime.nsec = get_be32(&ondisk->mtime.nsec); |
| 1648 | ce->ce_stat_data.sd_dev = get_be32(&ondisk->dev); |
| 1649 | ce->ce_stat_data.sd_ino = get_be32(&ondisk->ino); |
| 1650 | ce->ce_mode = get_be32(&ondisk->mode); |
| 1651 | ce->ce_stat_data.sd_uid = get_be32(&ondisk->uid); |
| 1652 | ce->ce_stat_data.sd_gid = get_be32(&ondisk->gid); |
| 1653 | ce->ce_stat_data.sd_size = get_be32(&ondisk->size); |
Thomas Gummerer | b60e188 | 2012-07-11 11:22:37 +0200 | [diff] [blame] | 1654 | ce->ce_flags = flags & ~CE_NAMEMASK; |
| 1655 | ce->ce_namelen = len; |
Nguyễn Thái Ngọc Duy | 5fc2fc8 | 2014-06-13 19:19:36 +0700 | [diff] [blame] | 1656 | ce->index = 0; |
brian m. carlson | 99d1a98 | 2016-09-05 20:07:52 +0000 | [diff] [blame] | 1657 | hashcpy(ce->oid.hash, ondisk->sha1); |
Junio C Hamano | 3fc22b5 | 2012-04-03 15:53:13 -0700 | [diff] [blame] | 1658 | memcpy(ce->name, name, len); |
| 1659 | ce->name[len] = '\0'; |
| 1660 | return ce; |
| 1661 | } |
| 1662 | |
Junio C Hamano | 6c9cd16 | 2012-04-03 15:53:15 -0700 | [diff] [blame] | 1663 | /* |
| 1664 | * Adjacent cache entries tend to share the leading paths, so it makes |
| 1665 | * sense to only store the differences in later entries. In the v4 |
| 1666 | * on-disk format of the index, each on-disk cache entry stores the |
| 1667 | * number of bytes to be stripped from the end of the previous name, |
| 1668 | * and the bytes to append to the result, to come up with its name. |
| 1669 | */ |
| 1670 | static unsigned long expand_name_field(struct strbuf *name, const char *cp_) |
| 1671 | { |
| 1672 | const unsigned char *ep, *cp = (const unsigned char *)cp_; |
| 1673 | size_t len = decode_varint(&cp); |
| 1674 | |
| 1675 | if (name->len < len) |
| 1676 | die("malformed name field in the index"); |
| 1677 | strbuf_remove(name, name->len - len, len); |
| 1678 | for (ep = cp; *ep; ep++) |
| 1679 | ; /* find the end */ |
| 1680 | strbuf_add(name, cp, ep - cp); |
| 1681 | return (const char *)ep + 1 - cp_; |
| 1682 | } |
| 1683 | |
Junio C Hamano | 936f53d | 2012-04-03 15:53:11 -0700 | [diff] [blame] | 1684 | static struct cache_entry *create_from_disk(struct ondisk_cache_entry *ondisk, |
Junio C Hamano | 6c9cd16 | 2012-04-03 15:53:15 -0700 | [diff] [blame] | 1685 | unsigned long *ent_size, |
| 1686 | struct strbuf *previous_name) |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1687 | { |
René Scharfe | debed2a | 2011-10-24 23:59:14 +0200 | [diff] [blame] | 1688 | struct cache_entry *ce; |
Junio C Hamano | 7fec10b | 2008-01-18 23:42:00 -0800 | [diff] [blame] | 1689 | size_t len; |
Nguyễn Thái Ngọc Duy | 06aaaa0 | 2008-10-01 11:04:01 +0700 | [diff] [blame] | 1690 | const char *name; |
René Scharfe | debed2a | 2011-10-24 23:59:14 +0200 | [diff] [blame] | 1691 | unsigned int flags; |
| 1692 | |
| 1693 | /* On-disk flags are just 16 bits */ |
Jeff King | c3d8da5 | 2014-01-23 16:26:42 -0500 | [diff] [blame] | 1694 | flags = get_be16(&ondisk->flags); |
René Scharfe | debed2a | 2011-10-24 23:59:14 +0200 | [diff] [blame] | 1695 | len = flags & CE_NAMEMASK; |
| 1696 | |
| 1697 | if (flags & CE_EXTENDED) { |
| 1698 | struct ondisk_cache_entry_extended *ondisk2; |
| 1699 | int extended_flags; |
| 1700 | ondisk2 = (struct ondisk_cache_entry_extended *)ondisk; |
Jeff King | c3d8da5 | 2014-01-23 16:26:42 -0500 | [diff] [blame] | 1701 | extended_flags = get_be16(&ondisk2->flags2) << 16; |
René Scharfe | debed2a | 2011-10-24 23:59:14 +0200 | [diff] [blame] | 1702 | /* We do not yet understand any bit out of CE_EXTENDED_FLAGS */ |
| 1703 | if (extended_flags & ~CE_EXTENDED_FLAGS) |
| 1704 | die("Unknown index entry format %08x", extended_flags); |
| 1705 | flags |= extended_flags; |
| 1706 | name = ondisk2->name; |
| 1707 | } |
| 1708 | else |
| 1709 | name = ondisk->name; |
| 1710 | |
Junio C Hamano | 6c9cd16 | 2012-04-03 15:53:15 -0700 | [diff] [blame] | 1711 | if (!previous_name) { |
| 1712 | /* v3 and earlier */ |
| 1713 | if (len == CE_NAMEMASK) |
| 1714 | len = strlen(name); |
| 1715 | ce = cache_entry_from_ondisk(ondisk, flags, name, len); |
René Scharfe | debed2a | 2011-10-24 23:59:14 +0200 | [diff] [blame] | 1716 | |
Junio C Hamano | 6c9cd16 | 2012-04-03 15:53:15 -0700 | [diff] [blame] | 1717 | *ent_size = ondisk_ce_size(ce); |
| 1718 | } else { |
| 1719 | unsigned long consumed; |
| 1720 | consumed = expand_name_field(previous_name, name); |
| 1721 | ce = cache_entry_from_ondisk(ondisk, flags, |
| 1722 | previous_name->buf, |
| 1723 | previous_name->len); |
Junio C Hamano | 7fec10b | 2008-01-18 23:42:00 -0800 | [diff] [blame] | 1724 | |
Junio C Hamano | 6c9cd16 | 2012-04-03 15:53:15 -0700 | [diff] [blame] | 1725 | *ent_size = (name - ((char *)ondisk)) + consumed; |
| 1726 | } |
René Scharfe | debed2a | 2011-10-24 23:59:14 +0200 | [diff] [blame] | 1727 | return ce; |
Linus Torvalds | cf55870 | 2008-01-22 18:41:14 -0800 | [diff] [blame] | 1728 | } |
| 1729 | |
Thomas Gummerer | 03f15a7 | 2015-03-20 22:43:14 +0100 | [diff] [blame] | 1730 | static void check_ce_order(struct index_state *istate) |
Jaime Soriano Pastor | 15999d0 | 2014-08-29 10:54:41 +0200 | [diff] [blame] | 1731 | { |
Thomas Gummerer | 03f15a7 | 2015-03-20 22:43:14 +0100 | [diff] [blame] | 1732 | unsigned int i; |
| 1733 | |
Ben Peart | 00ec50e | 2017-10-18 10:27:25 -0400 | [diff] [blame] | 1734 | if (!verify_ce_order) |
| 1735 | return; |
| 1736 | |
Thomas Gummerer | 03f15a7 | 2015-03-20 22:43:14 +0100 | [diff] [blame] | 1737 | for (i = 1; i < istate->cache_nr; i++) { |
| 1738 | struct cache_entry *ce = istate->cache[i - 1]; |
| 1739 | struct cache_entry *next_ce = istate->cache[i]; |
| 1740 | int name_compare = strcmp(ce->name, next_ce->name); |
| 1741 | |
| 1742 | if (0 < name_compare) |
| 1743 | die("unordered stage entries in index"); |
| 1744 | if (!name_compare) { |
| 1745 | if (!ce_stage(ce)) |
| 1746 | die("multiple stage entries for merged file '%s'", |
| 1747 | ce->name); |
| 1748 | if (ce_stage(ce) > ce_stage(next_ce)) |
| 1749 | die("unordered stage entries for '%s'", |
| 1750 | ce->name); |
| 1751 | } |
Jaime Soriano Pastor | 15999d0 | 2014-08-29 10:54:41 +0200 | [diff] [blame] | 1752 | } |
| 1753 | } |
| 1754 | |
Christian Couder | 435ec09 | 2016-01-27 07:58:05 +0100 | [diff] [blame] | 1755 | static void tweak_untracked_cache(struct index_state *istate) |
| 1756 | { |
| 1757 | switch (git_config_get_untracked_cache()) { |
| 1758 | case -1: /* keep: do nothing */ |
| 1759 | break; |
| 1760 | case 0: /* false */ |
| 1761 | remove_untracked_cache(istate); |
| 1762 | break; |
| 1763 | case 1: /* true */ |
| 1764 | add_untracked_cache(istate); |
| 1765 | break; |
| 1766 | default: /* unknown value: do nothing */ |
| 1767 | break; |
| 1768 | } |
| 1769 | } |
| 1770 | |
Christian Couder | 4392531 | 2017-02-27 19:00:02 +0100 | [diff] [blame] | 1771 | static void tweak_split_index(struct index_state *istate) |
| 1772 | { |
| 1773 | switch (git_config_get_split_index()) { |
| 1774 | case -1: /* unset: do nothing */ |
| 1775 | break; |
| 1776 | case 0: /* false */ |
| 1777 | remove_split_index(istate); |
| 1778 | break; |
| 1779 | case 1: /* true */ |
| 1780 | add_split_index(istate); |
| 1781 | break; |
| 1782 | default: /* unknown value: do nothing */ |
| 1783 | break; |
| 1784 | } |
| 1785 | } |
| 1786 | |
Christian Couder | 435ec09 | 2016-01-27 07:58:05 +0100 | [diff] [blame] | 1787 | static void post_read_index_from(struct index_state *istate) |
| 1788 | { |
| 1789 | check_ce_order(istate); |
| 1790 | tweak_untracked_cache(istate); |
Christian Couder | 4392531 | 2017-02-27 19:00:02 +0100 | [diff] [blame] | 1791 | tweak_split_index(istate); |
Ben Peart | 883e248 | 2017-09-22 12:35:40 -0400 | [diff] [blame] | 1792 | tweak_fsmonitor(istate); |
Christian Couder | 435ec09 | 2016-01-27 07:58:05 +0100 | [diff] [blame] | 1793 | } |
| 1794 | |
Johannes Schindelin | 8fd2cb4 | 2006-07-25 21:32:18 -0700 | [diff] [blame] | 1795 | /* remember to discard_cache() before reading a different cache! */ |
Nguyễn Thái Ngọc Duy | 3e52f70 | 2014-06-13 19:19:51 +0700 | [diff] [blame] | 1796 | int do_read_index(struct index_state *istate, const char *path, int must_exist) |
Johannes Schindelin | 8fd2cb4 | 2006-07-25 21:32:18 -0700 | [diff] [blame] | 1797 | { |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1798 | int fd, i; |
| 1799 | struct stat st; |
René Scharfe | debed2a | 2011-10-24 23:59:14 +0200 | [diff] [blame] | 1800 | unsigned long src_offset; |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1801 | struct cache_header *hdr; |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1802 | void *mmap; |
| 1803 | size_t mmap_size; |
Junio C Hamano | 6c9cd16 | 2012-04-03 15:53:15 -0700 | [diff] [blame] | 1804 | struct strbuf previous_name_buf = STRBUF_INIT, *previous_name; |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1805 | |
Junio C Hamano | 913e0e9 | 2008-08-23 12:57:30 -0700 | [diff] [blame] | 1806 | if (istate->initialized) |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1807 | return istate->cache_nr; |
Linus Torvalds | 5d1a5c0 | 2005-10-01 13:24:27 -0700 | [diff] [blame] | 1808 | |
Kjetil Barvik | fba2f38 | 2009-02-19 21:08:29 +0100 | [diff] [blame] | 1809 | istate->timestamp.sec = 0; |
| 1810 | istate->timestamp.nsec = 0; |
Johannes Schindelin | 8fd2cb4 | 2006-07-25 21:32:18 -0700 | [diff] [blame] | 1811 | fd = open(path, O_RDONLY); |
Linus Torvalds | 5d1a5c0 | 2005-10-01 13:24:27 -0700 | [diff] [blame] | 1812 | if (fd < 0) { |
Nguyễn Thái Ngọc Duy | 5fc2fc8 | 2014-06-13 19:19:36 +0700 | [diff] [blame] | 1813 | if (!must_exist && errno == ENOENT) |
Linus Torvalds | 5d1a5c0 | 2005-10-01 13:24:27 -0700 | [diff] [blame] | 1814 | return 0; |
Nguyễn Thái Ngọc Duy | 5fc2fc8 | 2014-06-13 19:19:36 +0700 | [diff] [blame] | 1815 | die_errno("%s: index file open failed", path); |
Linus Torvalds | 5d1a5c0 | 2005-10-01 13:24:27 -0700 | [diff] [blame] | 1816 | } |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1817 | |
Luiz Fernando N. Capitulino | 3511a37 | 2007-04-25 11:18:17 -0300 | [diff] [blame] | 1818 | if (fstat(fd, &st)) |
Thomas Rast | d824cbb | 2009-06-27 17:58:46 +0200 | [diff] [blame] | 1819 | die_errno("cannot stat the open index"); |
Luiz Fernando N. Capitulino | 3511a37 | 2007-04-25 11:18:17 -0300 | [diff] [blame] | 1820 | |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1821 | mmap_size = xsize_t(st.st_size); |
brian m. carlson | aab6135 | 2018-02-01 02:18:45 +0000 | [diff] [blame] | 1822 | if (mmap_size < sizeof(struct cache_header) + the_hash_algo->rawsz) |
Luiz Fernando N. Capitulino | 3511a37 | 2007-04-25 11:18:17 -0300 | [diff] [blame] | 1823 | die("index file smaller than expected"); |
| 1824 | |
Jeff King | a1293ef | 2015-05-28 03:54:00 -0400 | [diff] [blame] | 1825 | mmap = xmmap(NULL, mmap_size, PROT_READ, MAP_PRIVATE, fd, 0); |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1826 | if (mmap == MAP_FAILED) |
Thomas Rast | 0721c31 | 2009-06-27 17:58:47 +0200 | [diff] [blame] | 1827 | die_errno("unable to map index file"); |
Nguyễn Thái Ngọc Duy | 57d84f8 | 2012-08-06 18:27:09 +0700 | [diff] [blame] | 1828 | close(fd); |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1829 | |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1830 | hdr = mmap; |
| 1831 | if (verify_hdr(hdr, mmap_size) < 0) |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1832 | goto unmap; |
| 1833 | |
brian m. carlson | 75691ea | 2018-05-02 00:25:44 +0000 | [diff] [blame] | 1834 | hashcpy(istate->oid.hash, (const unsigned char *)hdr + mmap_size - the_hash_algo->rawsz); |
Junio C Hamano | 9d22778 | 2012-04-04 09:12:43 -0700 | [diff] [blame] | 1835 | istate->version = ntohl(hdr->hdr_version); |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1836 | istate->cache_nr = ntohl(hdr->hdr_entries); |
| 1837 | istate->cache_alloc = alloc_nr(istate->cache_nr); |
Felipe Contreras | c4aa316 | 2013-05-30 08:56:19 -0500 | [diff] [blame] | 1838 | istate->cache = xcalloc(istate->cache_alloc, sizeof(*istate->cache)); |
Junio C Hamano | 913e0e9 | 2008-08-23 12:57:30 -0700 | [diff] [blame] | 1839 | istate->initialized = 1; |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1840 | |
Junio C Hamano | 9d22778 | 2012-04-04 09:12:43 -0700 | [diff] [blame] | 1841 | if (istate->version == 4) |
Junio C Hamano | 6c9cd16 | 2012-04-03 15:53:15 -0700 | [diff] [blame] | 1842 | previous_name = &previous_name_buf; |
| 1843 | else |
| 1844 | previous_name = NULL; |
| 1845 | |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1846 | src_offset = sizeof(*hdr); |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1847 | for (i = 0; i < istate->cache_nr; i++) { |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1848 | struct ondisk_cache_entry *disk_ce; |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1849 | struct cache_entry *ce; |
Junio C Hamano | 936f53d | 2012-04-03 15:53:11 -0700 | [diff] [blame] | 1850 | unsigned long consumed; |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1851 | |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1852 | disk_ce = (struct ondisk_cache_entry *)((char *)mmap + src_offset); |
Junio C Hamano | 6c9cd16 | 2012-04-03 15:53:15 -0700 | [diff] [blame] | 1853 | ce = create_from_disk(disk_ce, &consumed, previous_name); |
Linus Torvalds | cf55870 | 2008-01-22 18:41:14 -0800 | [diff] [blame] | 1854 | set_index_entry(istate, i, ce); |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1855 | |
Junio C Hamano | 936f53d | 2012-04-03 15:53:11 -0700 | [diff] [blame] | 1856 | src_offset += consumed; |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1857 | } |
Junio C Hamano | 6c9cd16 | 2012-04-03 15:53:15 -0700 | [diff] [blame] | 1858 | strbuf_release(&previous_name_buf); |
Kjetil Barvik | fba2f38 | 2009-02-19 21:08:29 +0100 | [diff] [blame] | 1859 | istate->timestamp.sec = st.st_mtime; |
Kjetil Barvik | c06ff49 | 2009-03-04 18:47:40 +0100 | [diff] [blame] | 1860 | istate->timestamp.nsec = ST_MTIME_NSEC(st); |
Kjetil Barvik | fba2f38 | 2009-02-19 21:08:29 +0100 | [diff] [blame] | 1861 | |
brian m. carlson | aab6135 | 2018-02-01 02:18:45 +0000 | [diff] [blame] | 1862 | while (src_offset <= mmap_size - the_hash_algo->rawsz - 8) { |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 1863 | /* After an array of active_nr index entries, |
| 1864 | * there can be arbitrary number of extended |
| 1865 | * sections, each of which is prefixed with |
| 1866 | * extension name (4-byte) and section length |
| 1867 | * in 4-byte network byte order. |
| 1868 | */ |
Nathaniel W Filardo | 07cc8ec | 2009-12-27 01:11:21 -0500 | [diff] [blame] | 1869 | uint32_t extsize; |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1870 | memcpy(&extsize, (char *)mmap + src_offset + 4, 4); |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 1871 | extsize = ntohl(extsize); |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1872 | if (read_index_extension(istate, |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1873 | (const char *) mmap + src_offset, |
| 1874 | (char *) mmap + src_offset + 8, |
Florian Forster | 1d7f171 | 2006-06-18 17:18:09 +0200 | [diff] [blame] | 1875 | extsize) < 0) |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 1876 | goto unmap; |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1877 | src_offset += 8; |
| 1878 | src_offset += extsize; |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 1879 | } |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1880 | munmap(mmap, mmap_size); |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1881 | return istate->cache_nr; |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1882 | |
| 1883 | unmap: |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1884 | munmap(mmap, mmap_size); |
Linus Torvalds | 5d1a5c0 | 2005-10-01 13:24:27 -0700 | [diff] [blame] | 1885 | die("index file corrupt"); |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1886 | } |
| 1887 | |
Christian Couder | 0d59ffb | 2017-02-27 19:00:12 +0100 | [diff] [blame] | 1888 | /* |
| 1889 | * Signal that the shared index is used by updating its mtime. |
| 1890 | * |
| 1891 | * This way, shared index can be removed if they have not been used |
| 1892 | * for some time. |
| 1893 | */ |
Thomas Gummerer | a125a22 | 2018-01-07 22:30:13 +0000 | [diff] [blame] | 1894 | static void freshen_shared_index(const char *shared_index, int warn) |
Christian Couder | 0d59ffb | 2017-02-27 19:00:12 +0100 | [diff] [blame] | 1895 | { |
Christian Couder | 0d59ffb | 2017-02-27 19:00:12 +0100 | [diff] [blame] | 1896 | if (!check_and_freshen_file(shared_index, 1) && warn) |
| 1897 | warning("could not freshen shared index '%s'", shared_index); |
| 1898 | } |
| 1899 | |
Thomas Gummerer | a125a22 | 2018-01-07 22:30:13 +0000 | [diff] [blame] | 1900 | int read_index_from(struct index_state *istate, const char *path, |
| 1901 | const char *gitdir) |
Nguyễn Thái Ngọc Duy | 5fc2fc8 | 2014-06-13 19:19:36 +0700 | [diff] [blame] | 1902 | { |
Nguyễn Thái Ngọc Duy | ca54d9b | 2018-01-27 19:27:56 +0700 | [diff] [blame] | 1903 | uint64_t start = getnanotime(); |
Nguyễn Thái Ngọc Duy | 5fc2fc8 | 2014-06-13 19:19:36 +0700 | [diff] [blame] | 1904 | struct split_index *split_index; |
| 1905 | int ret; |
brian m. carlson | 2182abd | 2018-05-02 00:25:43 +0000 | [diff] [blame] | 1906 | char *base_oid_hex; |
Thomas Gummerer | a125a22 | 2018-01-07 22:30:13 +0000 | [diff] [blame] | 1907 | char *base_path; |
Nguyễn Thái Ngọc Duy | 5fc2fc8 | 2014-06-13 19:19:36 +0700 | [diff] [blame] | 1908 | |
| 1909 | /* istate->initialized covers both .git/index and .git/sharedindex.xxx */ |
| 1910 | if (istate->initialized) |
| 1911 | return istate->cache_nr; |
| 1912 | |
| 1913 | ret = do_read_index(istate, path, 0); |
Nguyễn Thái Ngọc Duy | ca54d9b | 2018-01-27 19:27:56 +0700 | [diff] [blame] | 1914 | trace_performance_since(start, "read cache %s", path); |
Christian Couder | 435ec09 | 2016-01-27 07:58:05 +0100 | [diff] [blame] | 1915 | |
Nguyễn Thái Ngọc Duy | 5fc2fc8 | 2014-06-13 19:19:36 +0700 | [diff] [blame] | 1916 | split_index = istate->split_index; |
brian m. carlson | 2182abd | 2018-05-02 00:25:43 +0000 | [diff] [blame] | 1917 | if (!split_index || is_null_oid(&split_index->base_oid)) { |
Christian Couder | 435ec09 | 2016-01-27 07:58:05 +0100 | [diff] [blame] | 1918 | post_read_index_from(istate); |
Nguyễn Thái Ngọc Duy | 5fc2fc8 | 2014-06-13 19:19:36 +0700 | [diff] [blame] | 1919 | return ret; |
Thomas Gummerer | 03f15a7 | 2015-03-20 22:43:14 +0100 | [diff] [blame] | 1920 | } |
Nguyễn Thái Ngọc Duy | 5fc2fc8 | 2014-06-13 19:19:36 +0700 | [diff] [blame] | 1921 | |
| 1922 | if (split_index->base) |
| 1923 | discard_index(split_index->base); |
| 1924 | else |
| 1925 | split_index->base = xcalloc(1, sizeof(*split_index->base)); |
Christian Couder | de6ae5f | 2017-03-06 10:42:00 +0100 | [diff] [blame] | 1926 | |
brian m. carlson | 2182abd | 2018-05-02 00:25:43 +0000 | [diff] [blame] | 1927 | base_oid_hex = oid_to_hex(&split_index->base_oid); |
| 1928 | base_path = xstrfmt("%s/sharedindex.%s", gitdir, base_oid_hex); |
Christian Couder | de6ae5f | 2017-03-06 10:42:00 +0100 | [diff] [blame] | 1929 | ret = do_read_index(split_index->base, base_path, 1); |
brian m. carlson | 75691ea | 2018-05-02 00:25:44 +0000 | [diff] [blame] | 1930 | if (oidcmp(&split_index->base_oid, &split_index->base->oid)) |
Nguyễn Thái Ngọc Duy | 5fc2fc8 | 2014-06-13 19:19:36 +0700 | [diff] [blame] | 1931 | die("broken index, expect %s in %s, got %s", |
brian m. carlson | 2182abd | 2018-05-02 00:25:43 +0000 | [diff] [blame] | 1932 | base_oid_hex, base_path, |
brian m. carlson | 75691ea | 2018-05-02 00:25:44 +0000 | [diff] [blame] | 1933 | oid_to_hex(&split_index->base->oid)); |
Christian Couder | de6ae5f | 2017-03-06 10:42:00 +0100 | [diff] [blame] | 1934 | |
Thomas Gummerer | a125a22 | 2018-01-07 22:30:13 +0000 | [diff] [blame] | 1935 | freshen_shared_index(base_path, 0); |
Nguyễn Thái Ngọc Duy | 5fc2fc8 | 2014-06-13 19:19:36 +0700 | [diff] [blame] | 1936 | merge_base_index(istate); |
Christian Couder | 435ec09 | 2016-01-27 07:58:05 +0100 | [diff] [blame] | 1937 | post_read_index_from(istate); |
Nguyễn Thái Ngọc Duy | ca54d9b | 2018-01-27 19:27:56 +0700 | [diff] [blame] | 1938 | trace_performance_since(start, "read cache %s", base_path); |
Thomas Gummerer | a125a22 | 2018-01-07 22:30:13 +0000 | [diff] [blame] | 1939 | free(base_path); |
Nguyễn Thái Ngọc Duy | 5fc2fc8 | 2014-06-13 19:19:36 +0700 | [diff] [blame] | 1940 | return ret; |
| 1941 | } |
| 1942 | |
Junio C Hamano | fa7b3c2 | 2008-11-12 11:52:35 -0800 | [diff] [blame] | 1943 | int is_index_unborn(struct index_state *istate) |
| 1944 | { |
René Scharfe | debed2a | 2011-10-24 23:59:14 +0200 | [diff] [blame] | 1945 | return (!istate->cache_nr && !istate->timestamp.sec); |
Junio C Hamano | fa7b3c2 | 2008-11-12 11:52:35 -0800 | [diff] [blame] | 1946 | } |
| 1947 | |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1948 | int discard_index(struct index_state *istate) |
Johannes Schindelin | 6d297f8 | 2006-07-08 18:42:41 +0200 | [diff] [blame] | 1949 | { |
René Scharfe | debed2a | 2011-10-24 23:59:14 +0200 | [diff] [blame] | 1950 | int i; |
| 1951 | |
Junio C Hamano | 64719b1 | 2017-06-24 12:02:39 -0700 | [diff] [blame] | 1952 | for (i = 0; i < istate->cache_nr; i++) { |
| 1953 | if (istate->cache[i]->index && |
| 1954 | istate->split_index && |
| 1955 | istate->split_index->base && |
| 1956 | istate->cache[i]->index <= istate->split_index->base->cache_nr && |
| 1957 | istate->cache[i] == istate->split_index->base->cache[istate->cache[i]->index - 1]) |
| 1958 | continue; |
René Scharfe | debed2a | 2011-10-24 23:59:14 +0200 | [diff] [blame] | 1959 | free(istate->cache[i]); |
Junio C Hamano | 64719b1 | 2017-06-24 12:02:39 -0700 | [diff] [blame] | 1960 | } |
Junio C Hamano | cfc5789 | 2009-12-25 00:30:51 -0800 | [diff] [blame] | 1961 | resolve_undo_clear_index(istate); |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1962 | istate->cache_nr = 0; |
| 1963 | istate->cache_changed = 0; |
Kjetil Barvik | fba2f38 | 2009-02-19 21:08:29 +0100 | [diff] [blame] | 1964 | istate->timestamp.sec = 0; |
| 1965 | istate->timestamp.nsec = 0; |
Karsten Blees | 2092678 | 2013-02-28 00:57:48 +0100 | [diff] [blame] | 1966 | free_name_hash(istate); |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1967 | cache_tree_free(&(istate->cache_tree)); |
Junio C Hamano | 913e0e9 | 2008-08-23 12:57:30 -0700 | [diff] [blame] | 1968 | istate->initialized = 0; |
Ævar Arnfjörð Bjarmason | 6a83d90 | 2017-06-15 23:15:46 +0000 | [diff] [blame] | 1969 | FREE_AND_NULL(istate->cache); |
René Scharfe | a0fc4db | 2013-06-09 19:39:18 +0200 | [diff] [blame] | 1970 | istate->cache_alloc = 0; |
Nguyễn Thái Ngọc Duy | 5fc2fc8 | 2014-06-13 19:19:36 +0700 | [diff] [blame] | 1971 | discard_split_index(istate); |
Nguyễn Thái Ngọc Duy | f9e6c64 | 2015-03-08 17:12:34 +0700 | [diff] [blame] | 1972 | free_untracked_cache(istate->untracked); |
| 1973 | istate->untracked = NULL; |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1974 | return 0; |
Johannes Schindelin | 6d297f8 | 2006-07-08 18:42:41 +0200 | [diff] [blame] | 1975 | } |
| 1976 | |
Linus Torvalds | d1f128b | 2008-03-06 12:46:09 -0800 | [diff] [blame] | 1977 | int unmerged_index(const struct index_state *istate) |
Daniel Barkalow | 94a5728 | 2008-02-07 11:40:13 -0500 | [diff] [blame] | 1978 | { |
| 1979 | int i; |
| 1980 | for (i = 0; i < istate->cache_nr; i++) { |
| 1981 | if (ce_stage(istate->cache[i])) |
| 1982 | return 1; |
| 1983 | } |
| 1984 | return 0; |
| 1985 | } |
| 1986 | |
Linus Torvalds | 4990aad | 2005-04-20 12:16:57 -0700 | [diff] [blame] | 1987 | #define WRITE_BUFFER_SIZE 8192 |
Brian Gerst | bf0f910 | 2005-05-18 08:14:09 -0400 | [diff] [blame] | 1988 | static unsigned char write_buffer[WRITE_BUFFER_SIZE]; |
Linus Torvalds | 4990aad | 2005-04-20 12:16:57 -0700 | [diff] [blame] | 1989 | static unsigned long write_buffer_len; |
| 1990 | |
brian m. carlson | aab6135 | 2018-02-01 02:18:45 +0000 | [diff] [blame] | 1991 | static int ce_write_flush(git_hash_ctx *context, int fd) |
Junio C Hamano | 6015c28 | 2006-08-08 14:47:32 -0700 | [diff] [blame] | 1992 | { |
| 1993 | unsigned int buffered = write_buffer_len; |
| 1994 | if (buffered) { |
brian m. carlson | aab6135 | 2018-02-01 02:18:45 +0000 | [diff] [blame] | 1995 | the_hash_algo->update_fn(context, write_buffer, buffered); |
Jeff King | 06f46f2 | 2017-09-13 13:16:03 -0400 | [diff] [blame] | 1996 | if (write_in_full(fd, write_buffer, buffered) < 0) |
Junio C Hamano | 6015c28 | 2006-08-08 14:47:32 -0700 | [diff] [blame] | 1997 | return -1; |
| 1998 | write_buffer_len = 0; |
| 1999 | } |
| 2000 | return 0; |
| 2001 | } |
| 2002 | |
brian m. carlson | aab6135 | 2018-02-01 02:18:45 +0000 | [diff] [blame] | 2003 | static int ce_write(git_hash_ctx *context, int fd, void *data, unsigned int len) |
Linus Torvalds | 4990aad | 2005-04-20 12:16:57 -0700 | [diff] [blame] | 2004 | { |
| 2005 | while (len) { |
| 2006 | unsigned int buffered = write_buffer_len; |
| 2007 | unsigned int partial = WRITE_BUFFER_SIZE - buffered; |
| 2008 | if (partial > len) |
| 2009 | partial = len; |
| 2010 | memcpy(write_buffer + buffered, data, partial); |
| 2011 | buffered += partial; |
| 2012 | if (buffered == WRITE_BUFFER_SIZE) { |
Junio C Hamano | 6015c28 | 2006-08-08 14:47:32 -0700 | [diff] [blame] | 2013 | write_buffer_len = buffered; |
| 2014 | if (ce_write_flush(context, fd)) |
Linus Torvalds | 4990aad | 2005-04-20 12:16:57 -0700 | [diff] [blame] | 2015 | return -1; |
| 2016 | buffered = 0; |
| 2017 | } |
| 2018 | write_buffer_len = buffered; |
| 2019 | len -= partial; |
Florian Forster | 1d7f171 | 2006-06-18 17:18:09 +0200 | [diff] [blame] | 2020 | data = (char *) data + partial; |
Junio C Hamano | a6080a0 | 2007-06-07 00:04:01 -0700 | [diff] [blame] | 2021 | } |
| 2022 | return 0; |
Linus Torvalds | 4990aad | 2005-04-20 12:16:57 -0700 | [diff] [blame] | 2023 | } |
| 2024 | |
brian m. carlson | aab6135 | 2018-02-01 02:18:45 +0000 | [diff] [blame] | 2025 | static int write_index_ext_header(git_hash_ctx *context, int fd, |
Dennis Stosberg | ac58c7b | 2006-05-28 21:08:08 +0200 | [diff] [blame] | 2026 | unsigned int ext, unsigned int sz) |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 2027 | { |
| 2028 | ext = htonl(ext); |
| 2029 | sz = htonl(sz); |
David Rientjes | 968a1d6 | 2006-08-14 13:38:14 -0700 | [diff] [blame] | 2030 | return ((ce_write(context, fd, &ext, 4) < 0) || |
| 2031 | (ce_write(context, fd, &sz, 4) < 0)) ? -1 : 0; |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 2032 | } |
| 2033 | |
brian m. carlson | aab6135 | 2018-02-01 02:18:45 +0000 | [diff] [blame] | 2034 | static int ce_flush(git_hash_ctx *context, int fd, unsigned char *hash) |
Linus Torvalds | 4990aad | 2005-04-20 12:16:57 -0700 | [diff] [blame] | 2035 | { |
| 2036 | unsigned int left = write_buffer_len; |
Linus Torvalds | ca9be05 | 2005-04-20 12:36:41 -0700 | [diff] [blame] | 2037 | |
Linus Torvalds | 4990aad | 2005-04-20 12:16:57 -0700 | [diff] [blame] | 2038 | if (left) { |
| 2039 | write_buffer_len = 0; |
brian m. carlson | aab6135 | 2018-02-01 02:18:45 +0000 | [diff] [blame] | 2040 | the_hash_algo->update_fn(context, write_buffer, left); |
Linus Torvalds | 4990aad | 2005-04-20 12:16:57 -0700 | [diff] [blame] | 2041 | } |
Linus Torvalds | ca9be05 | 2005-04-20 12:36:41 -0700 | [diff] [blame] | 2042 | |
brian m. carlson | aab6135 | 2018-02-01 02:18:45 +0000 | [diff] [blame] | 2043 | /* Flush first if not enough space for hash signature */ |
| 2044 | if (left + the_hash_algo->rawsz > WRITE_BUFFER_SIZE) { |
Jeff King | 06f46f2 | 2017-09-13 13:16:03 -0400 | [diff] [blame] | 2045 | if (write_in_full(fd, write_buffer, left) < 0) |
Qingning Huo | 2c865d9 | 2005-09-11 14:27:47 +0100 | [diff] [blame] | 2046 | return -1; |
| 2047 | left = 0; |
| 2048 | } |
| 2049 | |
brian m. carlson | aab6135 | 2018-02-01 02:18:45 +0000 | [diff] [blame] | 2050 | /* Append the hash signature at the end */ |
| 2051 | the_hash_algo->final_fn(write_buffer + left, context); |
| 2052 | hashcpy(hash, write_buffer + left); |
| 2053 | left += the_hash_algo->rawsz; |
Jeff King | 06f46f2 | 2017-09-13 13:16:03 -0400 | [diff] [blame] | 2054 | return (write_in_full(fd, write_buffer, left) < 0) ? -1 : 0; |
Linus Torvalds | 4990aad | 2005-04-20 12:16:57 -0700 | [diff] [blame] | 2055 | } |
| 2056 | |
Junio C Hamano | 407c8eb | 2005-12-20 12:12:18 -0800 | [diff] [blame] | 2057 | static void ce_smudge_racily_clean_entry(struct cache_entry *ce) |
| 2058 | { |
| 2059 | /* |
| 2060 | * The only thing we care about in this function is to smudge the |
| 2061 | * falsely clean entry due to touch-update-touch race, so we leave |
| 2062 | * everything else as they are. We are called for entries whose |
Michael Haggerty | c21d39d | 2013-06-20 10:37:50 +0200 | [diff] [blame] | 2063 | * ce_stat_data.sd_mtime match the index file mtime. |
Junio C Hamano | c70115b | 2008-07-29 01:13:44 -0700 | [diff] [blame] | 2064 | * |
| 2065 | * Note that this actually does not do much for gitlinks, for |
| 2066 | * which ce_match_stat_basic() always goes to the actual |
| 2067 | * contents. The caller checks with is_racy_timestamp() which |
| 2068 | * always says "no" for gitlinks, so we are not called for them ;-) |
Junio C Hamano | 407c8eb | 2005-12-20 12:12:18 -0800 | [diff] [blame] | 2069 | */ |
| 2070 | struct stat st; |
| 2071 | |
| 2072 | if (lstat(ce->name, &st) < 0) |
| 2073 | return; |
| 2074 | if (ce_match_stat_basic(ce, &st)) |
| 2075 | return; |
| 2076 | if (ce_modified_check_fs(ce, &st)) { |
Junio C Hamano | 4b3511b | 2005-12-20 14:18:47 -0800 | [diff] [blame] | 2077 | /* This is "racily clean"; smudge it. Note that this |
| 2078 | * is a tricky code. At first glance, it may appear |
| 2079 | * that it can break with this sequence: |
| 2080 | * |
| 2081 | * $ echo xyzzy >frotz |
| 2082 | * $ git-update-index --add frotz |
| 2083 | * $ : >frotz |
| 2084 | * $ sleep 3 |
| 2085 | * $ echo filfre >nitfol |
| 2086 | * $ git-update-index --add nitfol |
| 2087 | * |
Junio C Hamano | b7e58b1 | 2006-08-05 04:16:02 -0700 | [diff] [blame] | 2088 | * but it does not. When the second update-index runs, |
Junio C Hamano | 4b3511b | 2005-12-20 14:18:47 -0800 | [diff] [blame] | 2089 | * it notices that the entry "frotz" has the same timestamp |
| 2090 | * as index, and if we were to smudge it by resetting its |
| 2091 | * size to zero here, then the object name recorded |
| 2092 | * in index is the 6-byte file but the cached stat information |
| 2093 | * becomes zero --- which would then match what we would |
Junio C Hamano | a6080a0 | 2007-06-07 00:04:01 -0700 | [diff] [blame] | 2094 | * obtain from the filesystem next time we stat("frotz"). |
Junio C Hamano | 4b3511b | 2005-12-20 14:18:47 -0800 | [diff] [blame] | 2095 | * |
| 2096 | * However, the second update-index, before calling |
| 2097 | * this function, notices that the cached size is 6 |
| 2098 | * bytes and what is on the filesystem is an empty |
| 2099 | * file, and never calls us, so the cached size information |
| 2100 | * for "frotz" stays 6 which does not match the filesystem. |
| 2101 | */ |
Michael Haggerty | c21d39d | 2013-06-20 10:37:50 +0200 | [diff] [blame] | 2102 | ce->ce_stat_data.sd_size = 0; |
Junio C Hamano | 407c8eb | 2005-12-20 12:12:18 -0800 | [diff] [blame] | 2103 | } |
| 2104 | } |
| 2105 | |
Junio C Hamano | f136f7b | 2012-04-03 15:53:14 -0700 | [diff] [blame] | 2106 | /* Copy miscellaneous fields but not the name */ |
Kevin Willford | ce012de | 2017-08-21 15:24:32 -0600 | [diff] [blame] | 2107 | static void copy_cache_entry_to_ondisk(struct ondisk_cache_entry *ondisk, |
Junio C Hamano | f136f7b | 2012-04-03 15:53:14 -0700 | [diff] [blame] | 2108 | struct cache_entry *ce) |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 2109 | { |
Thomas Gummerer | b60e188 | 2012-07-11 11:22:37 +0200 | [diff] [blame] | 2110 | short flags; |
| 2111 | |
Michael Haggerty | c21d39d | 2013-06-20 10:37:50 +0200 | [diff] [blame] | 2112 | ondisk->ctime.sec = htonl(ce->ce_stat_data.sd_ctime.sec); |
| 2113 | ondisk->mtime.sec = htonl(ce->ce_stat_data.sd_mtime.sec); |
| 2114 | ondisk->ctime.nsec = htonl(ce->ce_stat_data.sd_ctime.nsec); |
| 2115 | ondisk->mtime.nsec = htonl(ce->ce_stat_data.sd_mtime.nsec); |
| 2116 | ondisk->dev = htonl(ce->ce_stat_data.sd_dev); |
| 2117 | ondisk->ino = htonl(ce->ce_stat_data.sd_ino); |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 2118 | ondisk->mode = htonl(ce->ce_mode); |
Michael Haggerty | c21d39d | 2013-06-20 10:37:50 +0200 | [diff] [blame] | 2119 | ondisk->uid = htonl(ce->ce_stat_data.sd_uid); |
| 2120 | ondisk->gid = htonl(ce->ce_stat_data.sd_gid); |
| 2121 | ondisk->size = htonl(ce->ce_stat_data.sd_size); |
brian m. carlson | 99d1a98 | 2016-09-05 20:07:52 +0000 | [diff] [blame] | 2122 | hashcpy(ondisk->sha1, ce->oid.hash); |
Thomas Gummerer | b60e188 | 2012-07-11 11:22:37 +0200 | [diff] [blame] | 2123 | |
Nguyễn Thái Ngọc Duy | ce51bf0 | 2014-06-13 19:19:25 +0700 | [diff] [blame] | 2124 | flags = ce->ce_flags & ~CE_NAMEMASK; |
Thomas Gummerer | b60e188 | 2012-07-11 11:22:37 +0200 | [diff] [blame] | 2125 | flags |= (ce_namelen(ce) >= CE_NAMEMASK ? CE_NAMEMASK : ce_namelen(ce)); |
| 2126 | ondisk->flags = htons(flags); |
Nguyễn Thái Ngọc Duy | 06aaaa0 | 2008-10-01 11:04:01 +0700 | [diff] [blame] | 2127 | if (ce->ce_flags & CE_EXTENDED) { |
| 2128 | struct ondisk_cache_entry_extended *ondisk2; |
| 2129 | ondisk2 = (struct ondisk_cache_entry_extended *)ondisk; |
| 2130 | ondisk2->flags2 = htons((ce->ce_flags & CE_EXTENDED_FLAGS) >> 16); |
Junio C Hamano | f136f7b | 2012-04-03 15:53:14 -0700 | [diff] [blame] | 2131 | } |
| 2132 | } |
| 2133 | |
brian m. carlson | aab6135 | 2018-02-01 02:18:45 +0000 | [diff] [blame] | 2134 | static int ce_write_entry(git_hash_ctx *c, int fd, struct cache_entry *ce, |
Kevin Willford | ce012de | 2017-08-21 15:24:32 -0600 | [diff] [blame] | 2135 | struct strbuf *previous_name, struct ondisk_cache_entry *ondisk) |
Junio C Hamano | f136f7b | 2012-04-03 15:53:14 -0700 | [diff] [blame] | 2136 | { |
Junio C Hamano | 9d22778 | 2012-04-04 09:12:43 -0700 | [diff] [blame] | 2137 | int size; |
Junio C Hamano | f136f7b | 2012-04-03 15:53:14 -0700 | [diff] [blame] | 2138 | int result; |
Ramsay Jones | 00a4b03 | 2018-03-19 17:56:11 +0000 | [diff] [blame] | 2139 | unsigned int saved_namelen; |
| 2140 | int stripped_name = 0; |
Kevin Willford | ce012de | 2017-08-21 15:24:32 -0600 | [diff] [blame] | 2141 | static unsigned char padding[8] = { 0x00 }; |
Junio C Hamano | f136f7b | 2012-04-03 15:53:14 -0700 | [diff] [blame] | 2142 | |
Nguyễn Thái Ngọc Duy | b3c96fb | 2014-06-13 19:19:43 +0700 | [diff] [blame] | 2143 | if (ce->ce_flags & CE_STRIP_NAME) { |
| 2144 | saved_namelen = ce_namelen(ce); |
| 2145 | ce->ce_namelen = 0; |
Ramsay Jones | 00a4b03 | 2018-03-19 17:56:11 +0000 | [diff] [blame] | 2146 | stripped_name = 1; |
Nguyễn Thái Ngọc Duy | b3c96fb | 2014-06-13 19:19:43 +0700 | [diff] [blame] | 2147 | } |
| 2148 | |
Kevin Willford | ce012de | 2017-08-21 15:24:32 -0600 | [diff] [blame] | 2149 | if (ce->ce_flags & CE_EXTENDED) |
| 2150 | size = offsetof(struct ondisk_cache_entry_extended, name); |
| 2151 | else |
| 2152 | size = offsetof(struct ondisk_cache_entry, name); |
| 2153 | |
Junio C Hamano | 9d22778 | 2012-04-04 09:12:43 -0700 | [diff] [blame] | 2154 | if (!previous_name) { |
Kevin Willford | ce012de | 2017-08-21 15:24:32 -0600 | [diff] [blame] | 2155 | int len = ce_namelen(ce); |
| 2156 | copy_cache_entry_to_ondisk(ondisk, ce); |
| 2157 | result = ce_write(c, fd, ondisk, size); |
| 2158 | if (!result) |
| 2159 | result = ce_write(c, fd, ce->name, len); |
| 2160 | if (!result) |
| 2161 | result = ce_write(c, fd, padding, align_padding_size(size, len)); |
Junio C Hamano | 9d22778 | 2012-04-04 09:12:43 -0700 | [diff] [blame] | 2162 | } else { |
| 2163 | int common, to_remove, prefix_size; |
| 2164 | unsigned char to_remove_vi[16]; |
| 2165 | for (common = 0; |
| 2166 | (ce->name[common] && |
| 2167 | common < previous_name->len && |
| 2168 | ce->name[common] == previous_name->buf[common]); |
| 2169 | common++) |
| 2170 | ; /* still matching */ |
| 2171 | to_remove = previous_name->len - common; |
| 2172 | prefix_size = encode_varint(to_remove, to_remove_vi); |
| 2173 | |
Kevin Willford | ce012de | 2017-08-21 15:24:32 -0600 | [diff] [blame] | 2174 | copy_cache_entry_to_ondisk(ondisk, ce); |
| 2175 | result = ce_write(c, fd, ondisk, size); |
| 2176 | if (!result) |
| 2177 | result = ce_write(c, fd, to_remove_vi, prefix_size); |
| 2178 | if (!result) |
Thomas Gummerer | 0b90b88 | 2017-09-07 20:24:12 +0100 | [diff] [blame] | 2179 | result = ce_write(c, fd, ce->name + common, ce_namelen(ce) - common); |
| 2180 | if (!result) |
| 2181 | result = ce_write(c, fd, padding, 1); |
Junio C Hamano | 9d22778 | 2012-04-04 09:12:43 -0700 | [diff] [blame] | 2182 | |
| 2183 | strbuf_splice(previous_name, common, to_remove, |
| 2184 | ce->name + common, ce_namelen(ce) - common); |
| 2185 | } |
Ramsay Jones | 00a4b03 | 2018-03-19 17:56:11 +0000 | [diff] [blame] | 2186 | if (stripped_name) { |
Nguyễn Thái Ngọc Duy | b3c96fb | 2014-06-13 19:19:43 +0700 | [diff] [blame] | 2187 | ce->ce_namelen = saved_namelen; |
| 2188 | ce->ce_flags &= ~CE_STRIP_NAME; |
| 2189 | } |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 2190 | |
Jonathan Nieder | 59efba6 | 2010-08-09 22:28:07 -0500 | [diff] [blame] | 2191 | return result; |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 2192 | } |
| 2193 | |
Yiannis Marangos | 426ddee | 2014-04-10 21:31:21 +0300 | [diff] [blame] | 2194 | /* |
| 2195 | * This function verifies if index_state has the correct sha1 of the |
| 2196 | * index file. Don't die if we have any other failure, just return 0. |
| 2197 | */ |
| 2198 | static int verify_index_from(const struct index_state *istate, const char *path) |
| 2199 | { |
| 2200 | int fd; |
| 2201 | ssize_t n; |
| 2202 | struct stat st; |
brian m. carlson | aab6135 | 2018-02-01 02:18:45 +0000 | [diff] [blame] | 2203 | unsigned char hash[GIT_MAX_RAWSZ]; |
Yiannis Marangos | 426ddee | 2014-04-10 21:31:21 +0300 | [diff] [blame] | 2204 | |
| 2205 | if (!istate->initialized) |
| 2206 | return 0; |
| 2207 | |
| 2208 | fd = open(path, O_RDONLY); |
| 2209 | if (fd < 0) |
| 2210 | return 0; |
| 2211 | |
| 2212 | if (fstat(fd, &st)) |
| 2213 | goto out; |
| 2214 | |
brian m. carlson | aab6135 | 2018-02-01 02:18:45 +0000 | [diff] [blame] | 2215 | if (st.st_size < sizeof(struct cache_header) + the_hash_algo->rawsz) |
Yiannis Marangos | 426ddee | 2014-04-10 21:31:21 +0300 | [diff] [blame] | 2216 | goto out; |
| 2217 | |
brian m. carlson | aab6135 | 2018-02-01 02:18:45 +0000 | [diff] [blame] | 2218 | n = pread_in_full(fd, hash, the_hash_algo->rawsz, st.st_size - the_hash_algo->rawsz); |
| 2219 | if (n != the_hash_algo->rawsz) |
Yiannis Marangos | 426ddee | 2014-04-10 21:31:21 +0300 | [diff] [blame] | 2220 | goto out; |
| 2221 | |
brian m. carlson | 75691ea | 2018-05-02 00:25:44 +0000 | [diff] [blame] | 2222 | if (hashcmp(istate->oid.hash, hash)) |
Yiannis Marangos | 426ddee | 2014-04-10 21:31:21 +0300 | [diff] [blame] | 2223 | goto out; |
| 2224 | |
| 2225 | close(fd); |
| 2226 | return 1; |
| 2227 | |
| 2228 | out: |
| 2229 | close(fd); |
| 2230 | return 0; |
| 2231 | } |
| 2232 | |
| 2233 | static int verify_index(const struct index_state *istate) |
| 2234 | { |
| 2235 | return verify_index_from(istate, get_index_file()); |
| 2236 | } |
| 2237 | |
Junio C Hamano | 483fbe2 | 2011-03-21 10:18:19 -0700 | [diff] [blame] | 2238 | static int has_racy_timestamp(struct index_state *istate) |
| 2239 | { |
| 2240 | int entries = istate->cache_nr; |
| 2241 | int i; |
| 2242 | |
| 2243 | for (i = 0; i < entries; i++) { |
| 2244 | struct cache_entry *ce = istate->cache[i]; |
| 2245 | if (is_racy_timestamp(istate, ce)) |
| 2246 | return 1; |
| 2247 | } |
| 2248 | return 0; |
| 2249 | } |
| 2250 | |
Junio C Hamano | ccdc4ec | 2011-03-21 10:16:10 -0700 | [diff] [blame] | 2251 | void update_index_if_able(struct index_state *istate, struct lock_file *lockfile) |
| 2252 | { |
Junio C Hamano | 483fbe2 | 2011-03-21 10:18:19 -0700 | [diff] [blame] | 2253 | if ((istate->cache_changed || has_racy_timestamp(istate)) && |
Martin Ågren | df60cf5 | 2017-10-06 22:12:13 +0200 | [diff] [blame] | 2254 | verify_index(istate)) |
| 2255 | write_locked_index(istate, lockfile, COMMIT_LOCK); |
Martin Ågren | b74c90f | 2017-10-06 22:12:14 +0200 | [diff] [blame] | 2256 | else |
| 2257 | rollback_lock_file(lockfile); |
Junio C Hamano | ccdc4ec | 2011-03-21 10:16:10 -0700 | [diff] [blame] | 2258 | } |
| 2259 | |
Martin Ågren | 812d6b0 | 2017-10-06 22:12:12 +0200 | [diff] [blame] | 2260 | /* |
| 2261 | * On success, `tempfile` is closed. If it is the temporary file |
| 2262 | * of a `struct lock_file`, we will therefore effectively perform |
| 2263 | * a 'close_lock_file_gently()`. Since that is an implementation |
| 2264 | * detail of lockfiles, callers of `do_write_index()` should not |
| 2265 | * rely on it. |
| 2266 | */ |
Jeff Hostetler | 9f41c7a | 2017-04-26 22:05:23 +0200 | [diff] [blame] | 2267 | static int do_write_index(struct index_state *istate, struct tempfile *tempfile, |
Nguyễn Thái Ngọc Duy | c18b80a | 2014-06-13 19:19:44 +0700 | [diff] [blame] | 2268 | int strip_extensions) |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 2269 | { |
Nguyễn Thái Ngọc Duy | ca54d9b | 2018-01-27 19:27:56 +0700 | [diff] [blame] | 2270 | uint64_t start = getnanotime(); |
Jeff Hostetler | 9f41c7a | 2017-04-26 22:05:23 +0200 | [diff] [blame] | 2271 | int newfd = tempfile->fd; |
brian m. carlson | aab6135 | 2018-02-01 02:18:45 +0000 | [diff] [blame] | 2272 | git_hash_ctx c; |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 2273 | struct cache_header hdr; |
Kevin Willford | b50386c | 2017-08-21 15:24:31 -0600 | [diff] [blame] | 2274 | int i, err = 0, removed, extended, hdr_version; |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 2275 | struct cache_entry **cache = istate->cache; |
| 2276 | int entries = istate->cache_nr; |
Kjetil Barvik | e1afca4 | 2009-02-23 19:02:57 +0100 | [diff] [blame] | 2277 | struct stat st; |
Kevin Willford | ce012de | 2017-08-21 15:24:32 -0600 | [diff] [blame] | 2278 | struct ondisk_cache_entry_extended ondisk; |
Junio C Hamano | 9d22778 | 2012-04-04 09:12:43 -0700 | [diff] [blame] | 2279 | struct strbuf previous_name_buf = STRBUF_INIT, *previous_name; |
Thomas Gummerer | 4bddd98 | 2018-01-07 22:30:14 +0000 | [diff] [blame] | 2280 | int drop_cache_tree = istate->drop_cache_tree; |
Junio C Hamano | 025a070 | 2005-06-10 01:32:37 -0700 | [diff] [blame] | 2281 | |
Nguyễn Thái Ngọc Duy | 06aaaa0 | 2008-10-01 11:04:01 +0700 | [diff] [blame] | 2282 | for (i = removed = extended = 0; i < entries; i++) { |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 2283 | if (cache[i]->ce_flags & CE_REMOVE) |
Junio C Hamano | 025a070 | 2005-06-10 01:32:37 -0700 | [diff] [blame] | 2284 | removed++; |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 2285 | |
Nguyễn Thái Ngọc Duy | 06aaaa0 | 2008-10-01 11:04:01 +0700 | [diff] [blame] | 2286 | /* reduce extended entries if possible */ |
| 2287 | cache[i]->ce_flags &= ~CE_EXTENDED; |
| 2288 | if (cache[i]->ce_flags & CE_EXTENDED_FLAGS) { |
| 2289 | extended++; |
| 2290 | cache[i]->ce_flags |= CE_EXTENDED; |
| 2291 | } |
| 2292 | } |
| 2293 | |
Nguyễn Thái Ngọc Duy | d6e3c18 | 2014-06-13 19:19:49 +0700 | [diff] [blame] | 2294 | if (!istate->version) { |
Thomas Gummerer | 136347d | 2014-02-23 21:49:57 +0100 | [diff] [blame] | 2295 | istate->version = get_index_format_default(); |
Nguyễn Thái Ngọc Duy | 4c2db93 | 2018-04-14 17:34:59 +0200 | [diff] [blame] | 2296 | if (git_env_bool("GIT_TEST_SPLIT_INDEX", 0)) |
Nguyễn Thái Ngọc Duy | d6e3c18 | 2014-06-13 19:19:49 +0700 | [diff] [blame] | 2297 | init_split_index(istate); |
| 2298 | } |
Junio C Hamano | 9d22778 | 2012-04-04 09:12:43 -0700 | [diff] [blame] | 2299 | |
| 2300 | /* demote version 3 to version 2 when the latter suffices */ |
| 2301 | if (istate->version == 3 || istate->version == 2) |
| 2302 | istate->version = extended ? 3 : 2; |
| 2303 | |
| 2304 | hdr_version = istate->version; |
| 2305 | |
Linus Torvalds | ccc4feb | 2005-04-15 10:44:27 -0700 | [diff] [blame] | 2306 | hdr.hdr_signature = htonl(CACHE_SIGNATURE); |
Junio C Hamano | 9d22778 | 2012-04-04 09:12:43 -0700 | [diff] [blame] | 2307 | hdr.hdr_version = htonl(hdr_version); |
Junio C Hamano | 025a070 | 2005-06-10 01:32:37 -0700 | [diff] [blame] | 2308 | hdr.hdr_entries = htonl(entries - removed); |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 2309 | |
brian m. carlson | aab6135 | 2018-02-01 02:18:45 +0000 | [diff] [blame] | 2310 | the_hash_algo->init_fn(&c); |
Linus Torvalds | ca9be05 | 2005-04-20 12:36:41 -0700 | [diff] [blame] | 2311 | if (ce_write(&c, newfd, &hdr, sizeof(hdr)) < 0) |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 2312 | return -1; |
| 2313 | |
Junio C Hamano | 9d22778 | 2012-04-04 09:12:43 -0700 | [diff] [blame] | 2314 | previous_name = (hdr_version == 4) ? &previous_name_buf : NULL; |
Kevin Willford | ce012de | 2017-08-21 15:24:32 -0600 | [diff] [blame] | 2315 | |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 2316 | for (i = 0; i < entries; i++) { |
| 2317 | struct cache_entry *ce = cache[i]; |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 2318 | if (ce->ce_flags & CE_REMOVE) |
Linus Torvalds | aa16021 | 2005-06-09 15:34:04 -0700 | [diff] [blame] | 2319 | continue; |
Junio C Hamano | e06c43c | 2008-03-30 09:25:52 -0700 | [diff] [blame] | 2320 | if (!ce_uptodate(ce) && is_racy_timestamp(istate, ce)) |
Junio C Hamano | 407c8eb | 2005-12-20 12:12:18 -0800 | [diff] [blame] | 2321 | ce_smudge_racily_clean_entry(ce); |
brian m. carlson | 99d1a98 | 2016-09-05 20:07:52 +0000 | [diff] [blame] | 2322 | if (is_null_oid(&ce->oid)) { |
Jeff King | 83bd743 | 2013-08-27 16:41:12 -0400 | [diff] [blame] | 2323 | static const char msg[] = "cache entry has null sha1: %s"; |
| 2324 | static int allow = -1; |
| 2325 | |
| 2326 | if (allow < 0) |
| 2327 | allow = git_env_bool("GIT_ALLOW_NULL_SHA1", 0); |
| 2328 | if (allow) |
| 2329 | warning(msg, ce->name); |
| 2330 | else |
Kevin Willford | b50386c | 2017-08-21 15:24:31 -0600 | [diff] [blame] | 2331 | err = error(msg, ce->name); |
Jeff King | a96d3cc | 2017-04-21 14:46:17 -0400 | [diff] [blame] | 2332 | |
| 2333 | drop_cache_tree = 1; |
Jeff King | 83bd743 | 2013-08-27 16:41:12 -0400 | [diff] [blame] | 2334 | } |
Kevin Willford | ce012de | 2017-08-21 15:24:32 -0600 | [diff] [blame] | 2335 | if (ce_write_entry(&c, newfd, ce, previous_name, (struct ondisk_cache_entry *)&ondisk) < 0) |
Kevin Willford | b50386c | 2017-08-21 15:24:31 -0600 | [diff] [blame] | 2336 | err = -1; |
| 2337 | |
| 2338 | if (err) |
| 2339 | break; |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 2340 | } |
Junio C Hamano | 9d22778 | 2012-04-04 09:12:43 -0700 | [diff] [blame] | 2341 | strbuf_release(&previous_name_buf); |
Junio C Hamano | 1af1c2b | 2006-04-23 16:52:08 -0700 | [diff] [blame] | 2342 | |
Kevin Willford | b50386c | 2017-08-21 15:24:31 -0600 | [diff] [blame] | 2343 | if (err) |
| 2344 | return err; |
| 2345 | |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 2346 | /* Write extension data here */ |
Nguyễn Thái Ngọc Duy | c18b80a | 2014-06-13 19:19:44 +0700 | [diff] [blame] | 2347 | if (!strip_extensions && istate->split_index) { |
Nguyễn Thái Ngọc Duy | 5fc2fc8 | 2014-06-13 19:19:36 +0700 | [diff] [blame] | 2348 | struct strbuf sb = STRBUF_INIT; |
| 2349 | |
| 2350 | err = write_link_extension(&sb, istate) < 0 || |
| 2351 | write_index_ext_header(&c, newfd, CACHE_EXT_LINK, |
| 2352 | sb.len) < 0 || |
| 2353 | ce_write(&c, newfd, sb.buf, sb.len) < 0; |
| 2354 | strbuf_release(&sb); |
| 2355 | if (err) |
| 2356 | return -1; |
| 2357 | } |
Jeff King | a96d3cc | 2017-04-21 14:46:17 -0400 | [diff] [blame] | 2358 | if (!strip_extensions && !drop_cache_tree && istate->cache_tree) { |
Brandon Casey | f285a2d | 2008-10-09 14:12:12 -0500 | [diff] [blame] | 2359 | struct strbuf sb = STRBUF_INIT; |
Pierre Habouzit | 1dffb8f | 2007-09-25 10:22:44 +0200 | [diff] [blame] | 2360 | |
Pierre Habouzit | 1dffb8f | 2007-09-25 10:22:44 +0200 | [diff] [blame] | 2361 | cache_tree_write(&sb, istate->cache_tree); |
| 2362 | err = write_index_ext_header(&c, newfd, CACHE_EXT_TREE, sb.len) < 0 |
| 2363 | || ce_write(&c, newfd, sb.buf, sb.len) < 0; |
| 2364 | strbuf_release(&sb); |
| 2365 | if (err) |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 2366 | return -1; |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 2367 | } |
Nguyễn Thái Ngọc Duy | c18b80a | 2014-06-13 19:19:44 +0700 | [diff] [blame] | 2368 | if (!strip_extensions && istate->resolve_undo) { |
Junio C Hamano | cfc5789 | 2009-12-25 00:30:51 -0800 | [diff] [blame] | 2369 | struct strbuf sb = STRBUF_INIT; |
| 2370 | |
| 2371 | resolve_undo_write(&sb, istate->resolve_undo); |
| 2372 | err = write_index_ext_header(&c, newfd, CACHE_EXT_RESOLVE_UNDO, |
| 2373 | sb.len) < 0 |
| 2374 | || ce_write(&c, newfd, sb.buf, sb.len) < 0; |
| 2375 | strbuf_release(&sb); |
| 2376 | if (err) |
| 2377 | return -1; |
| 2378 | } |
Nguyễn Thái Ngọc Duy | 83c094a | 2015-03-08 17:12:33 +0700 | [diff] [blame] | 2379 | if (!strip_extensions && istate->untracked) { |
| 2380 | struct strbuf sb = STRBUF_INIT; |
| 2381 | |
| 2382 | write_untracked_extension(&sb, istate->untracked); |
| 2383 | err = write_index_ext_header(&c, newfd, CACHE_EXT_UNTRACKED, |
| 2384 | sb.len) < 0 || |
| 2385 | ce_write(&c, newfd, sb.buf, sb.len) < 0; |
| 2386 | strbuf_release(&sb); |
| 2387 | if (err) |
| 2388 | return -1; |
| 2389 | } |
Ben Peart | 883e248 | 2017-09-22 12:35:40 -0400 | [diff] [blame] | 2390 | if (!strip_extensions && istate->fsmonitor_last_update) { |
| 2391 | struct strbuf sb = STRBUF_INIT; |
| 2392 | |
| 2393 | write_fsmonitor_extension(&sb, istate); |
| 2394 | err = write_index_ext_header(&c, newfd, CACHE_EXT_FSMONITOR, sb.len) < 0 |
| 2395 | || ce_write(&c, newfd, sb.buf, sb.len) < 0; |
| 2396 | strbuf_release(&sb); |
| 2397 | if (err) |
| 2398 | return -1; |
| 2399 | } |
Kjetil Barvik | e1afca4 | 2009-02-23 19:02:57 +0100 | [diff] [blame] | 2400 | |
brian m. carlson | 75691ea | 2018-05-02 00:25:44 +0000 | [diff] [blame] | 2401 | if (ce_flush(&c, newfd, istate->oid.hash)) |
Jeff Hostetler | 9f41c7a | 2017-04-26 22:05:23 +0200 | [diff] [blame] | 2402 | return -1; |
Jeff King | 49bd0fc | 2017-09-05 08:14:30 -0400 | [diff] [blame] | 2403 | if (close_tempfile_gently(tempfile)) { |
| 2404 | error(_("could not close '%s'"), tempfile->filename.buf); |
Jeff King | 49bd0fc | 2017-09-05 08:14:30 -0400 | [diff] [blame] | 2405 | return -1; |
| 2406 | } |
Jeff Hostetler | 9f41c7a | 2017-04-26 22:05:23 +0200 | [diff] [blame] | 2407 | if (stat(tempfile->filename.buf, &st)) |
Kjetil Barvik | e1afca4 | 2009-02-23 19:02:57 +0100 | [diff] [blame] | 2408 | return -1; |
Kjetil Barvik | 5bcf109 | 2009-03-15 12:38:55 +0100 | [diff] [blame] | 2409 | istate->timestamp.sec = (unsigned int)st.st_mtime; |
| 2410 | istate->timestamp.nsec = ST_MTIME_NSEC(st); |
Nguyễn Thái Ngọc Duy | ca54d9b | 2018-01-27 19:27:56 +0700 | [diff] [blame] | 2411 | trace_performance_since(start, "write index, changed mask = %x", istate->cache_changed); |
Kjetil Barvik | e1afca4 | 2009-02-23 19:02:57 +0100 | [diff] [blame] | 2412 | return 0; |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 2413 | } |
Miklos Vajna | e46bbcf | 2008-06-27 18:21:58 +0200 | [diff] [blame] | 2414 | |
Nguyễn Thái Ngọc Duy | 626f35c | 2014-06-13 19:19:24 +0700 | [diff] [blame] | 2415 | void set_alternate_index_output(const char *name) |
| 2416 | { |
| 2417 | alternate_index_output = name; |
| 2418 | } |
| 2419 | |
| 2420 | static int commit_locked_index(struct lock_file *lk) |
| 2421 | { |
Michael Haggerty | 751bace | 2014-10-01 12:28:36 +0200 | [diff] [blame] | 2422 | if (alternate_index_output) |
| 2423 | return commit_lock_file_to(lk, alternate_index_output); |
| 2424 | else |
Nguyễn Thái Ngọc Duy | 626f35c | 2014-06-13 19:19:24 +0700 | [diff] [blame] | 2425 | return commit_lock_file(lk); |
Nguyễn Thái Ngọc Duy | 626f35c | 2014-06-13 19:19:24 +0700 | [diff] [blame] | 2426 | } |
| 2427 | |
Nguyễn Thái Ngọc Duy | 03b8664 | 2014-06-13 19:19:23 +0700 | [diff] [blame] | 2428 | static int do_write_locked_index(struct index_state *istate, struct lock_file *lock, |
| 2429 | unsigned flags) |
| 2430 | { |
Jeff King | 076aa2c | 2017-09-05 08:15:08 -0400 | [diff] [blame] | 2431 | int ret = do_write_index(istate, lock->tempfile, 0); |
Nguyễn Thái Ngọc Duy | 03b8664 | 2014-06-13 19:19:23 +0700 | [diff] [blame] | 2432 | if (ret) |
| 2433 | return ret; |
Nguyễn Thái Ngọc Duy | 03b8664 | 2014-06-13 19:19:23 +0700 | [diff] [blame] | 2434 | if (flags & COMMIT_LOCK) |
| 2435 | return commit_locked_index(lock); |
Martin Ågren | 812d6b0 | 2017-10-06 22:12:12 +0200 | [diff] [blame] | 2436 | return close_lock_file_gently(lock); |
Nguyễn Thái Ngọc Duy | 03b8664 | 2014-06-13 19:19:23 +0700 | [diff] [blame] | 2437 | } |
| 2438 | |
Nguyễn Thái Ngọc Duy | 5fc2fc8 | 2014-06-13 19:19:36 +0700 | [diff] [blame] | 2439 | static int write_split_index(struct index_state *istate, |
| 2440 | struct lock_file *lock, |
| 2441 | unsigned flags) |
| 2442 | { |
| 2443 | int ret; |
| 2444 | prepare_to_write_split_index(istate); |
| 2445 | ret = do_write_locked_index(istate, lock, flags); |
| 2446 | finish_writing_split_index(istate); |
| 2447 | return ret; |
| 2448 | } |
| 2449 | |
Christian Couder | b968372 | 2017-03-06 10:41:58 +0100 | [diff] [blame] | 2450 | static const char *shared_index_expire = "2.weeks.ago"; |
| 2451 | |
| 2452 | static unsigned long get_shared_index_expire_date(void) |
| 2453 | { |
| 2454 | static unsigned long shared_index_expire_date; |
| 2455 | static int shared_index_expire_date_prepared; |
| 2456 | |
| 2457 | if (!shared_index_expire_date_prepared) { |
| 2458 | git_config_get_expiry("splitindex.sharedindexexpire", |
| 2459 | &shared_index_expire); |
| 2460 | shared_index_expire_date = approxidate(shared_index_expire); |
| 2461 | shared_index_expire_date_prepared = 1; |
| 2462 | } |
| 2463 | |
| 2464 | return shared_index_expire_date; |
| 2465 | } |
| 2466 | |
| 2467 | static int should_delete_shared_index(const char *shared_index_path) |
| 2468 | { |
| 2469 | struct stat st; |
| 2470 | unsigned long expiration; |
| 2471 | |
| 2472 | /* Check timestamp */ |
| 2473 | expiration = get_shared_index_expire_date(); |
| 2474 | if (!expiration) |
| 2475 | return 0; |
| 2476 | if (stat(shared_index_path, &st)) |
Peter Krefting | 78bde92 | 2017-04-30 23:32:48 +0200 | [diff] [blame] | 2477 | return error_errno(_("could not stat '%s'"), shared_index_path); |
Christian Couder | b968372 | 2017-03-06 10:41:58 +0100 | [diff] [blame] | 2478 | if (st.st_mtime > expiration) |
| 2479 | return 0; |
| 2480 | |
| 2481 | return 1; |
| 2482 | } |
| 2483 | |
| 2484 | static int clean_shared_index_files(const char *current_hex) |
| 2485 | { |
| 2486 | struct dirent *de; |
| 2487 | DIR *dir = opendir(get_git_dir()); |
| 2488 | |
| 2489 | if (!dir) |
| 2490 | return error_errno(_("unable to open git dir: %s"), get_git_dir()); |
| 2491 | |
| 2492 | while ((de = readdir(dir)) != NULL) { |
| 2493 | const char *sha1_hex; |
| 2494 | const char *shared_index_path; |
| 2495 | if (!skip_prefix(de->d_name, "sharedindex.", &sha1_hex)) |
| 2496 | continue; |
| 2497 | if (!strcmp(sha1_hex, current_hex)) |
| 2498 | continue; |
| 2499 | shared_index_path = git_path("%s", de->d_name); |
| 2500 | if (should_delete_shared_index(shared_index_path) > 0 && |
| 2501 | unlink(shared_index_path)) |
| 2502 | warning_errno(_("unable to unlink: %s"), shared_index_path); |
| 2503 | } |
| 2504 | closedir(dir); |
| 2505 | |
| 2506 | return 0; |
| 2507 | } |
| 2508 | |
Nguyễn Thái Ngọc Duy | a0a9675 | 2014-06-13 19:19:45 +0700 | [diff] [blame] | 2509 | static int write_shared_index(struct index_state *istate, |
Nguyễn Thái Ngọc Duy | 59f9d2d | 2018-01-14 17:18:19 +0700 | [diff] [blame] | 2510 | struct tempfile **temp) |
Nguyễn Thái Ngọc Duy | c18b80a | 2014-06-13 19:19:44 +0700 | [diff] [blame] | 2511 | { |
| 2512 | struct split_index *si = istate->split_index; |
Jeff King | 076aa2c | 2017-09-05 08:15:08 -0400 | [diff] [blame] | 2513 | int ret; |
Nguyễn Thái Ngọc Duy | c18b80a | 2014-06-13 19:19:44 +0700 | [diff] [blame] | 2514 | |
Nguyễn Thái Ngọc Duy | c18b80a | 2014-06-13 19:19:44 +0700 | [diff] [blame] | 2515 | move_cache_to_base_index(istate); |
Nguyễn Thái Ngọc Duy | 7db2d08 | 2018-01-14 17:18:18 +0700 | [diff] [blame] | 2516 | ret = do_write_index(si->base, *temp, 1); |
Nguyễn Thái Ngọc Duy | 59f9d2d | 2018-01-14 17:18:19 +0700 | [diff] [blame] | 2517 | if (ret) |
Nguyễn Thái Ngọc Duy | c18b80a | 2014-06-13 19:19:44 +0700 | [diff] [blame] | 2518 | return ret; |
Nguyễn Thái Ngọc Duy | 7db2d08 | 2018-01-14 17:18:18 +0700 | [diff] [blame] | 2519 | ret = adjust_shared_perm(get_tempfile_path(*temp)); |
Nguyễn Thái Ngọc Duy | c18b80a | 2014-06-13 19:19:44 +0700 | [diff] [blame] | 2520 | if (ret) { |
Nguyễn Thái Ngọc Duy | 7db2d08 | 2018-01-14 17:18:18 +0700 | [diff] [blame] | 2521 | error("cannot fix permission bits on %s", get_tempfile_path(*temp)); |
Nguyễn Thái Ngọc Duy | c18b80a | 2014-06-13 19:19:44 +0700 | [diff] [blame] | 2522 | return ret; |
| 2523 | } |
Nguyễn Thái Ngọc Duy | 7db2d08 | 2018-01-14 17:18:18 +0700 | [diff] [blame] | 2524 | ret = rename_tempfile(temp, |
brian m. carlson | 75691ea | 2018-05-02 00:25:44 +0000 | [diff] [blame] | 2525 | git_path("sharedindex.%s", oid_to_hex(&si->base->oid))); |
Christian Couder | b968372 | 2017-03-06 10:41:58 +0100 | [diff] [blame] | 2526 | if (!ret) { |
brian m. carlson | 75691ea | 2018-05-02 00:25:44 +0000 | [diff] [blame] | 2527 | oidcpy(&si->base_oid, &si->base->oid); |
| 2528 | clean_shared_index_files(oid_to_hex(&si->base->oid)); |
Christian Couder | b968372 | 2017-03-06 10:41:58 +0100 | [diff] [blame] | 2529 | } |
| 2530 | |
Nguyễn Thái Ngọc Duy | c18b80a | 2014-06-13 19:19:44 +0700 | [diff] [blame] | 2531 | return ret; |
| 2532 | } |
| 2533 | |
Christian Couder | e6a1dd7 | 2017-02-27 19:00:08 +0100 | [diff] [blame] | 2534 | static const int default_max_percent_split_change = 20; |
| 2535 | |
| 2536 | static int too_many_not_shared_entries(struct index_state *istate) |
| 2537 | { |
| 2538 | int i, not_shared = 0; |
| 2539 | int max_split = git_config_get_max_percent_split_change(); |
| 2540 | |
| 2541 | switch (max_split) { |
| 2542 | case -1: |
| 2543 | /* not or badly configured: use the default value */ |
| 2544 | max_split = default_max_percent_split_change; |
| 2545 | break; |
| 2546 | case 0: |
| 2547 | return 1; /* 0% means always write a new shared index */ |
| 2548 | case 100: |
| 2549 | return 0; /* 100% means never write a new shared index */ |
| 2550 | default: |
| 2551 | break; /* just use the configured value */ |
| 2552 | } |
| 2553 | |
| 2554 | /* Count not shared entries */ |
| 2555 | for (i = 0; i < istate->cache_nr; i++) { |
| 2556 | struct cache_entry *ce = istate->cache[i]; |
| 2557 | if (!ce->index) |
| 2558 | not_shared++; |
| 2559 | } |
| 2560 | |
| 2561 | return (int64_t)istate->cache_nr * max_split < (int64_t)not_shared * 100; |
| 2562 | } |
| 2563 | |
Nguyễn Thái Ngọc Duy | 03b8664 | 2014-06-13 19:19:23 +0700 | [diff] [blame] | 2564 | int write_locked_index(struct index_state *istate, struct lock_file *lock, |
| 2565 | unsigned flags) |
| 2566 | { |
Christian Couder | 0d59ffb | 2017-02-27 19:00:12 +0100 | [diff] [blame] | 2567 | int new_shared_index, ret; |
Nguyễn Thái Ngọc Duy | 5fc2fc8 | 2014-06-13 19:19:36 +0700 | [diff] [blame] | 2568 | struct split_index *si = istate->split_index; |
| 2569 | |
Martin Ågren | 6100081 | 2018-03-01 21:40:20 +0100 | [diff] [blame] | 2570 | if ((flags & SKIP_IF_UNCHANGED) && !istate->cache_changed) { |
| 2571 | if (flags & COMMIT_LOCK) |
| 2572 | rollback_lock_file(lock); |
| 2573 | return 0; |
| 2574 | } |
| 2575 | |
Alex Vandiver | 3bd28eb | 2017-11-09 11:58:10 -0800 | [diff] [blame] | 2576 | if (istate->fsmonitor_last_update) |
| 2577 | fill_fsmonitor_bitmap(istate); |
| 2578 | |
Nguyễn Thái Ngọc Duy | 5165dd5 | 2014-06-13 19:19:47 +0700 | [diff] [blame] | 2579 | if (!si || alternate_index_output || |
| 2580 | (istate->cache_changed & ~EXTMASK)) { |
Nguyễn Thái Ngọc Duy | 5fc2fc8 | 2014-06-13 19:19:36 +0700 | [diff] [blame] | 2581 | if (si) |
brian m. carlson | 2182abd | 2018-05-02 00:25:43 +0000 | [diff] [blame] | 2582 | oidclr(&si->base_oid); |
Martin Ågren | df60cf5 | 2017-10-06 22:12:13 +0200 | [diff] [blame] | 2583 | ret = do_write_locked_index(istate, lock, flags); |
| 2584 | goto out; |
Nguyễn Thái Ngọc Duy | 5fc2fc8 | 2014-06-13 19:19:36 +0700 | [diff] [blame] | 2585 | } |
| 2586 | |
Nguyễn Thái Ngọc Duy | 4c2db93 | 2018-04-14 17:34:59 +0200 | [diff] [blame] | 2587 | if (git_env_bool("GIT_TEST_SPLIT_INDEX", 0)) { |
brian m. carlson | 2182abd | 2018-05-02 00:25:43 +0000 | [diff] [blame] | 2588 | int v = si->base_oid.hash[0]; |
Nguyễn Thái Ngọc Duy | d6e3c18 | 2014-06-13 19:19:49 +0700 | [diff] [blame] | 2589 | if ((v & 15) < 6) |
| 2590 | istate->cache_changed |= SPLIT_INDEX_ORDERED; |
| 2591 | } |
Christian Couder | e6a1dd7 | 2017-02-27 19:00:08 +0100 | [diff] [blame] | 2592 | if (too_many_not_shared_entries(istate)) |
| 2593 | istate->cache_changed |= SPLIT_INDEX_ORDERED; |
Christian Couder | 0d59ffb | 2017-02-27 19:00:12 +0100 | [diff] [blame] | 2594 | |
| 2595 | new_shared_index = istate->cache_changed & SPLIT_INDEX_ORDERED; |
| 2596 | |
| 2597 | if (new_shared_index) { |
Nguyễn Thái Ngọc Duy | 59f9d2d | 2018-01-14 17:18:19 +0700 | [diff] [blame] | 2598 | struct tempfile *temp; |
| 2599 | int saved_errno; |
| 2600 | |
| 2601 | temp = mks_tempfile(git_path("sharedindex_XXXXXX")); |
| 2602 | if (!temp) { |
brian m. carlson | 2182abd | 2018-05-02 00:25:43 +0000 | [diff] [blame] | 2603 | oidclr(&si->base_oid); |
Nguyễn Thái Ngọc Duy | 59f9d2d | 2018-01-14 17:18:19 +0700 | [diff] [blame] | 2604 | ret = do_write_locked_index(istate, lock, flags); |
Nguyễn Thái Ngọc Duy | ef5b3a6 | 2018-01-24 16:38:29 +0700 | [diff] [blame] | 2605 | goto out; |
| 2606 | } |
| 2607 | ret = write_shared_index(istate, &temp); |
Nguyễn Thái Ngọc Duy | 59f9d2d | 2018-01-14 17:18:19 +0700 | [diff] [blame] | 2608 | |
| 2609 | saved_errno = errno; |
| 2610 | if (is_tempfile_active(temp)) |
| 2611 | delete_tempfile(&temp); |
| 2612 | errno = saved_errno; |
| 2613 | |
Nguyễn Thái Ngọc Duy | c18b80a | 2014-06-13 19:19:44 +0700 | [diff] [blame] | 2614 | if (ret) |
Martin Ågren | df60cf5 | 2017-10-06 22:12:13 +0200 | [diff] [blame] | 2615 | goto out; |
Nguyễn Thái Ngọc Duy | c18b80a | 2014-06-13 19:19:44 +0700 | [diff] [blame] | 2616 | } |
| 2617 | |
Christian Couder | 0d59ffb | 2017-02-27 19:00:12 +0100 | [diff] [blame] | 2618 | ret = write_split_index(istate, lock, flags); |
| 2619 | |
| 2620 | /* Freshen the shared index only if the split-index was written */ |
Thomas Gummerer | a125a22 | 2018-01-07 22:30:13 +0000 | [diff] [blame] | 2621 | if (!ret && !new_shared_index) { |
| 2622 | const char *shared_index = git_path("sharedindex.%s", |
brian m. carlson | 2182abd | 2018-05-02 00:25:43 +0000 | [diff] [blame] | 2623 | oid_to_hex(&si->base_oid)); |
Thomas Gummerer | a125a22 | 2018-01-07 22:30:13 +0000 | [diff] [blame] | 2624 | freshen_shared_index(shared_index, 1); |
| 2625 | } |
Christian Couder | 0d59ffb | 2017-02-27 19:00:12 +0100 | [diff] [blame] | 2626 | |
Martin Ågren | df60cf5 | 2017-10-06 22:12:13 +0200 | [diff] [blame] | 2627 | out: |
| 2628 | if (flags & COMMIT_LOCK) |
| 2629 | rollback_lock_file(lock); |
Christian Couder | 0d59ffb | 2017-02-27 19:00:12 +0100 | [diff] [blame] | 2630 | return ret; |
Nguyễn Thái Ngọc Duy | 03b8664 | 2014-06-13 19:19:23 +0700 | [diff] [blame] | 2631 | } |
| 2632 | |
Miklos Vajna | e46bbcf | 2008-06-27 18:21:58 +0200 | [diff] [blame] | 2633 | /* |
| 2634 | * Read the index file that is potentially unmerged into given |
Junio C Hamano | 63e8dc5 | 2008-12-05 17:54:11 -0800 | [diff] [blame] | 2635 | * index_state, dropping any unmerged entries. Returns true if |
Miklos Vajna | e46bbcf | 2008-06-27 18:21:58 +0200 | [diff] [blame] | 2636 | * the index is unmerged. Callers who want to refuse to work |
| 2637 | * from an unmerged state can call this and check its return value, |
| 2638 | * instead of calling read_cache(). |
| 2639 | */ |
| 2640 | int read_index_unmerged(struct index_state *istate) |
| 2641 | { |
| 2642 | int i; |
Junio C Hamano | d1a43f2 | 2008-10-15 16:00:06 -0700 | [diff] [blame] | 2643 | int unmerged = 0; |
Miklos Vajna | e46bbcf | 2008-06-27 18:21:58 +0200 | [diff] [blame] | 2644 | |
| 2645 | read_index(istate); |
Miklos Vajna | e46bbcf | 2008-06-27 18:21:58 +0200 | [diff] [blame] | 2646 | for (i = 0; i < istate->cache_nr; i++) { |
| 2647 | struct cache_entry *ce = istate->cache[i]; |
Junio C Hamano | d1a43f2 | 2008-10-15 16:00:06 -0700 | [diff] [blame] | 2648 | struct cache_entry *new_ce; |
| 2649 | int size, len; |
| 2650 | |
| 2651 | if (!ce_stage(ce)) |
Miklos Vajna | e46bbcf | 2008-06-27 18:21:58 +0200 | [diff] [blame] | 2652 | continue; |
Junio C Hamano | d1a43f2 | 2008-10-15 16:00:06 -0700 | [diff] [blame] | 2653 | unmerged = 1; |
Thomas Gummerer | 68c4f6a | 2012-07-06 18:07:30 +0200 | [diff] [blame] | 2654 | len = ce_namelen(ce); |
Junio C Hamano | d1a43f2 | 2008-10-15 16:00:06 -0700 | [diff] [blame] | 2655 | size = cache_entry_size(len); |
| 2656 | new_ce = xcalloc(1, size); |
Junio C Hamano | d1a43f2 | 2008-10-15 16:00:06 -0700 | [diff] [blame] | 2657 | memcpy(new_ce->name, ce->name, len); |
Thomas Gummerer | b60e188 | 2012-07-11 11:22:37 +0200 | [diff] [blame] | 2658 | new_ce->ce_flags = create_ce_flags(0) | CE_CONFLICTED; |
| 2659 | new_ce->ce_namelen = len; |
Junio C Hamano | d1a43f2 | 2008-10-15 16:00:06 -0700 | [diff] [blame] | 2660 | new_ce->ce_mode = ce->ce_mode; |
| 2661 | if (add_index_entry(istate, new_ce, 0)) |
| 2662 | return error("%s: cannot drop to stage #0", |
Karsten Blees | 5699d17 | 2013-11-14 20:24:37 +0100 | [diff] [blame] | 2663 | new_ce->name); |
Miklos Vajna | e46bbcf | 2008-06-27 18:21:58 +0200 | [diff] [blame] | 2664 | } |
Junio C Hamano | d1a43f2 | 2008-10-15 16:00:06 -0700 | [diff] [blame] | 2665 | return unmerged; |
Miklos Vajna | e46bbcf | 2008-06-27 18:21:58 +0200 | [diff] [blame] | 2666 | } |
Junio C Hamano | 041aee3 | 2008-07-21 01:24:17 -0700 | [diff] [blame] | 2667 | |
Jeff King | 98fa473 | 2008-10-16 11:07:26 -0400 | [diff] [blame] | 2668 | /* |
| 2669 | * Returns 1 if the path is an "other" path with respect to |
| 2670 | * the index; that is, the path is not mentioned in the index at all, |
| 2671 | * either as a file, a directory with some files in the index, |
| 2672 | * or as an unmerged entry. |
| 2673 | * |
| 2674 | * We helpfully remove a trailing "/" from directories so that |
| 2675 | * the output of read_directory can be used as-is. |
| 2676 | */ |
| 2677 | int index_name_is_other(const struct index_state *istate, const char *name, |
| 2678 | int namelen) |
| 2679 | { |
| 2680 | int pos; |
| 2681 | if (namelen && name[namelen - 1] == '/') |
| 2682 | namelen--; |
| 2683 | pos = index_name_pos(istate, name, namelen); |
| 2684 | if (0 <= pos) |
| 2685 | return 0; /* exact match */ |
| 2686 | pos = -pos - 1; |
| 2687 | if (pos < istate->cache_nr) { |
| 2688 | struct cache_entry *ce = istate->cache[pos]; |
| 2689 | if (ce_namelen(ce) == namelen && |
| 2690 | !memcmp(ce->name, name, namelen)) |
| 2691 | return 0; /* Yup, this one exists unmerged */ |
| 2692 | } |
| 2693 | return 1; |
| 2694 | } |
Lukas Fleischer | 29fb37b | 2013-04-13 15:28:30 +0200 | [diff] [blame] | 2695 | |
Brandon Williams | 8754250 | 2017-01-10 12:06:10 -0800 | [diff] [blame] | 2696 | void *read_blob_data_from_index(const struct index_state *istate, |
| 2697 | const char *path, unsigned long *size) |
Lukas Fleischer | 29fb37b | 2013-04-13 15:28:30 +0200 | [diff] [blame] | 2698 | { |
| 2699 | int pos, len; |
| 2700 | unsigned long sz; |
| 2701 | enum object_type type; |
| 2702 | void *data; |
| 2703 | |
| 2704 | len = strlen(path); |
| 2705 | pos = index_name_pos(istate, path, len); |
| 2706 | if (pos < 0) { |
| 2707 | /* |
| 2708 | * We might be in the middle of a merge, in which |
| 2709 | * case we would read stage #2 (ours). |
| 2710 | */ |
| 2711 | int i; |
| 2712 | for (i = -pos - 1; |
| 2713 | (pos < 0 && i < istate->cache_nr && |
| 2714 | !strcmp(istate->cache[i]->name, path)); |
| 2715 | i++) |
| 2716 | if (ce_stage(istate->cache[i]) == 2) |
| 2717 | pos = i; |
| 2718 | } |
| 2719 | if (pos < 0) |
| 2720 | return NULL; |
brian m. carlson | b4f5aca | 2018-03-12 02:27:53 +0000 | [diff] [blame] | 2721 | data = read_object_file(&istate->cache[pos]->oid, &type, &sz); |
Lukas Fleischer | 29fb37b | 2013-04-13 15:28:30 +0200 | [diff] [blame] | 2722 | if (!data || type != OBJ_BLOB) { |
| 2723 | free(data); |
| 2724 | return NULL; |
| 2725 | } |
Lukas Fleischer | ff36682 | 2013-04-13 15:28:31 +0200 | [diff] [blame] | 2726 | if (size) |
| 2727 | *size = sz; |
Lukas Fleischer | 29fb37b | 2013-04-13 15:28:30 +0200 | [diff] [blame] | 2728 | return data; |
| 2729 | } |
Michael Haggerty | 3861253 | 2013-06-20 10:37:51 +0200 | [diff] [blame] | 2730 | |
| 2731 | void stat_validity_clear(struct stat_validity *sv) |
| 2732 | { |
Ævar Arnfjörð Bjarmason | 6a83d90 | 2017-06-15 23:15:46 +0000 | [diff] [blame] | 2733 | FREE_AND_NULL(sv->sd); |
Michael Haggerty | 3861253 | 2013-06-20 10:37:51 +0200 | [diff] [blame] | 2734 | } |
| 2735 | |
| 2736 | int stat_validity_check(struct stat_validity *sv, const char *path) |
| 2737 | { |
| 2738 | struct stat st; |
| 2739 | |
| 2740 | if (stat(path, &st) < 0) |
| 2741 | return sv->sd == NULL; |
| 2742 | if (!sv->sd) |
| 2743 | return 0; |
| 2744 | return S_ISREG(st.st_mode) && !match_stat_data(sv->sd, &st); |
| 2745 | } |
| 2746 | |
| 2747 | void stat_validity_update(struct stat_validity *sv, int fd) |
| 2748 | { |
| 2749 | struct stat st; |
| 2750 | |
| 2751 | if (fstat(fd, &st) < 0 || !S_ISREG(st.st_mode)) |
| 2752 | stat_validity_clear(sv); |
| 2753 | else { |
| 2754 | if (!sv->sd) |
| 2755 | sv->sd = xcalloc(1, sizeof(struct stat_data)); |
| 2756 | fill_stat_data(sv->sd, &st); |
| 2757 | } |
| 2758 | } |
David Turner | edf3b90 | 2017-05-08 11:41:42 +0200 | [diff] [blame] | 2759 | |
| 2760 | void move_index_extensions(struct index_state *dst, struct index_state *src) |
| 2761 | { |
| 2762 | dst->untracked = src->untracked; |
| 2763 | src->untracked = NULL; |
| 2764 | } |