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" |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 8 | #include "cache-tree.h" |
Linus Torvalds | f35a6d3 | 2007-04-09 21:20:29 -0700 | [diff] [blame] | 9 | #include "refs.h" |
Alexandre Julliard | d616813 | 2007-08-11 23:59:01 +0200 | [diff] [blame] | 10 | #include "dir.h" |
Junio C Hamano | 041aee3 | 2008-07-21 01:24:17 -0700 | [diff] [blame] | 11 | #include "tree.h" |
| 12 | #include "commit.h" |
Junio C Hamano | 3942581 | 2008-08-21 01:44:53 -0700 | [diff] [blame] | 13 | #include "blob.h" |
Junio C Hamano | cfc5789 | 2009-12-25 00:30:51 -0800 | [diff] [blame] | 14 | #include "resolve-undo.h" |
Junio C Hamano | 6c9cd16 | 2012-04-03 15:53:15 -0700 | [diff] [blame] | 15 | #include "strbuf.h" |
| 16 | #include "varint.h" |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 17 | |
Brad King | 2576272 | 2014-01-27 09:45:08 -0500 | [diff] [blame] | 18 | static struct cache_entry *refresh_cache_entry(struct cache_entry *ce, |
| 19 | unsigned int options); |
Junio C Hamano | 87b29e5 | 2010-01-11 22:29:35 -0800 | [diff] [blame] | 20 | |
Thomas Gummerer | b60e188 | 2012-07-11 11:22:37 +0200 | [diff] [blame] | 21 | /* Mask for the name length in ce_flags in the on-disk index */ |
| 22 | |
| 23 | #define CE_NAMEMASK (0x0fff) |
| 24 | |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 25 | /* Index extensions. |
| 26 | * |
| 27 | * The first letter should be 'A'..'Z' for extensions that are not |
| 28 | * necessary for a correct operation (i.e. optimization data). |
| 29 | * When new extensions are added that _needs_ to be understood in |
| 30 | * order to correctly interpret the index file, pick character that |
| 31 | * is outside the range, to cause the reader to abort. |
| 32 | */ |
| 33 | |
| 34 | #define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) ) |
| 35 | #define CACHE_EXT_TREE 0x54524545 /* "TREE" */ |
Shawn O. Pearce | b659b49 | 2010-02-02 07:33:28 -0800 | [diff] [blame] | 36 | #define CACHE_EXT_RESOLVE_UNDO 0x52455543 /* "REUC" */ |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 37 | |
Junio C Hamano | 228e94f | 2007-04-01 18:14:06 -0700 | [diff] [blame] | 38 | struct index_state the_index; |
Johannes Schindelin | 8fd2cb4 | 2006-07-25 21:32:18 -0700 | [diff] [blame] | 39 | |
Junio C Hamano | 9cb76b8 | 2008-01-22 23:01:13 -0800 | [diff] [blame] | 40 | static void set_index_entry(struct index_state *istate, int nr, struct cache_entry *ce) |
| 41 | { |
| 42 | istate->cache[nr] = ce; |
Linus Torvalds | 96872bc | 2008-03-21 13:16:24 -0700 | [diff] [blame] | 43 | add_name_hash(istate, ce); |
Junio C Hamano | 9cb76b8 | 2008-01-22 23:01:13 -0800 | [diff] [blame] | 44 | } |
| 45 | |
Linus Torvalds | cf55870 | 2008-01-22 18:41:14 -0800 | [diff] [blame] | 46 | static void replace_index_entry(struct index_state *istate, int nr, struct cache_entry *ce) |
| 47 | { |
| 48 | struct cache_entry *old = istate->cache[nr]; |
| 49 | |
Karsten Blees | 2092678 | 2013-02-28 00:57:48 +0100 | [diff] [blame] | 50 | remove_name_hash(istate, old); |
Karsten Blees | 5699d17 | 2013-11-14 20:24:37 +0100 | [diff] [blame] | 51 | free(old); |
Linus Torvalds | a22c637 | 2008-02-22 20:37:40 -0800 | [diff] [blame] | 52 | set_index_entry(istate, nr, ce); |
Linus Torvalds | cf55870 | 2008-01-22 18:41:14 -0800 | [diff] [blame] | 53 | istate->cache_changed = 1; |
| 54 | } |
| 55 | |
Petr Baudis | 81dc230 | 2008-07-21 02:25:56 +0200 | [diff] [blame] | 56 | void rename_index_entry_at(struct index_state *istate, int nr, const char *new_name) |
| 57 | { |
| 58 | struct cache_entry *old = istate->cache[nr], *new; |
| 59 | int namelen = strlen(new_name); |
| 60 | |
| 61 | new = xmalloc(cache_entry_size(namelen)); |
| 62 | copy_cache_entry(new, old); |
Karsten Blees | 419a597 | 2013-11-14 20:22:27 +0100 | [diff] [blame] | 63 | new->ce_flags &= ~CE_HASHED; |
Thomas Gummerer | b60e188 | 2012-07-11 11:22:37 +0200 | [diff] [blame] | 64 | new->ce_namelen = namelen; |
Petr Baudis | 81dc230 | 2008-07-21 02:25:56 +0200 | [diff] [blame] | 65 | memcpy(new->name, new_name, namelen + 1); |
| 66 | |
| 67 | cache_tree_invalidate_path(istate->cache_tree, old->name); |
| 68 | remove_index_entry_at(istate, nr); |
| 69 | add_index_entry(istate, new, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE); |
| 70 | } |
| 71 | |
Michael Haggerty | c21d39d | 2013-06-20 10:37:50 +0200 | [diff] [blame] | 72 | void fill_stat_data(struct stat_data *sd, struct stat *st) |
| 73 | { |
| 74 | sd->sd_ctime.sec = (unsigned int)st->st_ctime; |
| 75 | sd->sd_mtime.sec = (unsigned int)st->st_mtime; |
| 76 | sd->sd_ctime.nsec = ST_CTIME_NSEC(*st); |
| 77 | sd->sd_mtime.nsec = ST_MTIME_NSEC(*st); |
| 78 | sd->sd_dev = st->st_dev; |
| 79 | sd->sd_ino = st->st_ino; |
| 80 | sd->sd_uid = st->st_uid; |
| 81 | sd->sd_gid = st->st_gid; |
| 82 | sd->sd_size = st->st_size; |
| 83 | } |
| 84 | |
| 85 | int match_stat_data(const struct stat_data *sd, struct stat *st) |
| 86 | { |
| 87 | int changed = 0; |
| 88 | |
| 89 | if (sd->sd_mtime.sec != (unsigned int)st->st_mtime) |
| 90 | changed |= MTIME_CHANGED; |
| 91 | if (trust_ctime && check_stat && |
| 92 | sd->sd_ctime.sec != (unsigned int)st->st_ctime) |
| 93 | changed |= CTIME_CHANGED; |
| 94 | |
| 95 | #ifdef USE_NSEC |
| 96 | if (check_stat && sd->sd_mtime.nsec != ST_MTIME_NSEC(*st)) |
| 97 | changed |= MTIME_CHANGED; |
| 98 | if (trust_ctime && check_stat && |
| 99 | sd->sd_ctime.nsec != ST_CTIME_NSEC(*st)) |
| 100 | changed |= CTIME_CHANGED; |
| 101 | #endif |
| 102 | |
| 103 | if (check_stat) { |
| 104 | if (sd->sd_uid != (unsigned int) st->st_uid || |
| 105 | sd->sd_gid != (unsigned int) st->st_gid) |
| 106 | changed |= OWNER_CHANGED; |
| 107 | if (sd->sd_ino != (unsigned int) st->st_ino) |
| 108 | changed |= INODE_CHANGED; |
| 109 | } |
| 110 | |
| 111 | #ifdef USE_STDEV |
| 112 | /* |
| 113 | * st_dev breaks on network filesystems where different |
| 114 | * clients will have different views of what "device" |
| 115 | * the filesystem is on |
| 116 | */ |
| 117 | if (check_stat && sd->sd_dev != (unsigned int) st->st_dev) |
| 118 | changed |= INODE_CHANGED; |
| 119 | #endif |
| 120 | |
| 121 | if (sd->sd_size != (unsigned int) st->st_size) |
| 122 | changed |= DATA_CHANGED; |
| 123 | |
| 124 | return changed; |
| 125 | } |
| 126 | |
Junio C Hamano | 415e96c | 2005-05-15 14:23:12 -0700 | [diff] [blame] | 127 | /* |
| 128 | * This only updates the "non-critical" parts of the directory |
| 129 | * cache, ie the parts that aren't tracked by GIT, and only used |
| 130 | * to validate the cache. |
| 131 | */ |
| 132 | void fill_stat_cache_info(struct cache_entry *ce, struct stat *st) |
| 133 | { |
Michael Haggerty | c21d39d | 2013-06-20 10:37:50 +0200 | [diff] [blame] | 134 | fill_stat_data(&ce->ce_stat_data, st); |
Junio C Hamano | 5f73076 | 2006-02-08 21:15:24 -0800 | [diff] [blame] | 135 | |
| 136 | if (assume_unchanged) |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 137 | ce->ce_flags |= CE_VALID; |
Junio C Hamano | eadb583 | 2008-01-18 23:45:24 -0800 | [diff] [blame] | 138 | |
| 139 | if (S_ISREG(st->st_mode)) |
| 140 | ce_mark_uptodate(ce); |
Junio C Hamano | 415e96c | 2005-05-15 14:23:12 -0700 | [diff] [blame] | 141 | } |
| 142 | |
René Scharfe | 21a6b9f | 2013-06-02 17:46:52 +0200 | [diff] [blame] | 143 | 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] | 144 | { |
| 145 | int match = -1; |
| 146 | int fd = open(ce->name, O_RDONLY); |
| 147 | |
| 148 | if (fd >= 0) { |
| 149 | unsigned char sha1[20]; |
Junio C Hamano | c4ce46f | 2011-05-08 01:47:33 -0700 | [diff] [blame] | 150 | if (!index_fd(sha1, fd, st, OBJ_BLOB, ce->name, 0)) |
David Rientjes | a89fccd | 2006-08-17 11:54:57 -0700 | [diff] [blame] | 151 | match = hashcmp(sha1, ce->sha1); |
Linus Torvalds | 7f8508e | 2006-07-31 09:55:15 -0700 | [diff] [blame] | 152 | /* index_fd() closed the file descriptor already */ |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 153 | } |
| 154 | return match; |
| 155 | } |
| 156 | |
René Scharfe | 21a6b9f | 2013-06-02 17:46:52 +0200 | [diff] [blame] | 157 | 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] | 158 | { |
| 159 | int match = -1; |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 160 | void *buffer; |
| 161 | unsigned long size; |
Nicolas Pitre | 21666f1 | 2007-02-26 14:55:59 -0500 | [diff] [blame] | 162 | enum object_type type; |
Linus Torvalds | a60272b | 2008-12-17 09:47:27 -0800 | [diff] [blame] | 163 | struct strbuf sb = STRBUF_INIT; |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 164 | |
Linus Torvalds | a60272b | 2008-12-17 09:47:27 -0800 | [diff] [blame] | 165 | if (strbuf_readlink(&sb, ce->name, expected_size)) |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 166 | return -1; |
Linus Torvalds | a60272b | 2008-12-17 09:47:27 -0800 | [diff] [blame] | 167 | |
Nicolas Pitre | 21666f1 | 2007-02-26 14:55:59 -0500 | [diff] [blame] | 168 | buffer = read_sha1_file(ce->sha1, &type, &size); |
Linus Torvalds | a60272b | 2008-12-17 09:47:27 -0800 | [diff] [blame] | 169 | if (buffer) { |
| 170 | if (size == sb.len) |
| 171 | match = memcmp(buffer, sb.buf, size); |
| 172 | free(buffer); |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 173 | } |
Linus Torvalds | a60272b | 2008-12-17 09:47:27 -0800 | [diff] [blame] | 174 | strbuf_release(&sb); |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 175 | return match; |
| 176 | } |
| 177 | |
René Scharfe | 21a6b9f | 2013-06-02 17:46:52 +0200 | [diff] [blame] | 178 | static int ce_compare_gitlink(const struct cache_entry *ce) |
Linus Torvalds | f35a6d3 | 2007-04-09 21:20:29 -0700 | [diff] [blame] | 179 | { |
| 180 | unsigned char sha1[20]; |
| 181 | |
| 182 | /* |
| 183 | * We don't actually require that the .git directory |
Martin Waitz | 302b928 | 2007-05-21 22:08:28 +0200 | [diff] [blame] | 184 | * under GITLINK directory be a valid git directory. It |
Linus Torvalds | f35a6d3 | 2007-04-09 21:20:29 -0700 | [diff] [blame] | 185 | * might even be missing (in case nobody populated that |
| 186 | * sub-project). |
| 187 | * |
| 188 | * If so, we consider it always to match. |
| 189 | */ |
| 190 | if (resolve_gitlink_ref(ce->name, "HEAD", sha1) < 0) |
| 191 | return 0; |
| 192 | return hashcmp(sha1, ce->sha1); |
| 193 | } |
| 194 | |
René Scharfe | 21a6b9f | 2013-06-02 17:46:52 +0200 | [diff] [blame] | 195 | 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] | 196 | { |
| 197 | switch (st->st_mode & S_IFMT) { |
| 198 | case S_IFREG: |
| 199 | if (ce_compare_data(ce, st)) |
| 200 | return DATA_CHANGED; |
| 201 | break; |
| 202 | case S_IFLNK: |
Shawn O. Pearce | dc49cd7 | 2007-03-06 20:44:37 -0500 | [diff] [blame] | 203 | if (ce_compare_link(ce, xsize_t(st->st_size))) |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 204 | return DATA_CHANGED; |
| 205 | break; |
Linus Torvalds | a8ee75b | 2007-04-13 09:24:13 -0700 | [diff] [blame] | 206 | case S_IFDIR: |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 207 | if (S_ISGITLINK(ce->ce_mode)) |
Junio C Hamano | c70115b | 2008-07-29 01:13:44 -0700 | [diff] [blame] | 208 | return ce_compare_gitlink(ce) ? DATA_CHANGED : 0; |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 209 | default: |
| 210 | return TYPE_CHANGED; |
| 211 | } |
| 212 | return 0; |
| 213 | } |
| 214 | |
René Scharfe | 21a6b9f | 2013-06-02 17:46:52 +0200 | [diff] [blame] | 215 | 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] | 216 | { |
| 217 | unsigned int changed = 0; |
| 218 | |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 219 | if (ce->ce_flags & CE_REMOVE) |
| 220 | return MODE_CHANGED | DATA_CHANGED | TYPE_CHANGED; |
| 221 | |
| 222 | switch (ce->ce_mode & S_IFMT) { |
Kay Sievers | 8ae0a8c | 2005-05-05 14:38:25 +0200 | [diff] [blame] | 223 | case S_IFREG: |
| 224 | changed |= !S_ISREG(st->st_mode) ? TYPE_CHANGED : 0; |
Junio C Hamano | 3e09cdf | 2005-10-11 18:45:33 -0700 | [diff] [blame] | 225 | /* We consider only the owner x bit to be relevant for |
| 226 | * "mode changes" |
| 227 | */ |
| 228 | if (trust_executable_bit && |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 229 | (0100 & (ce->ce_mode ^ st->st_mode))) |
Kay Sievers | ffbe1ad | 2005-05-06 15:45:01 +0200 | [diff] [blame] | 230 | changed |= MODE_CHANGED; |
Kay Sievers | 8ae0a8c | 2005-05-05 14:38:25 +0200 | [diff] [blame] | 231 | break; |
| 232 | case S_IFLNK: |
Johannes Sixt | 78a8d64 | 2007-03-02 22:11:30 +0100 | [diff] [blame] | 233 | if (!S_ISLNK(st->st_mode) && |
| 234 | (has_symlinks || !S_ISREG(st->st_mode))) |
| 235 | changed |= TYPE_CHANGED; |
Kay Sievers | 8ae0a8c | 2005-05-05 14:38:25 +0200 | [diff] [blame] | 236 | break; |
Martin Waitz | 302b928 | 2007-05-21 22:08:28 +0200 | [diff] [blame] | 237 | case S_IFGITLINK: |
Junio C Hamano | c70115b | 2008-07-29 01:13:44 -0700 | [diff] [blame] | 238 | /* We ignore most of the st_xxx fields for gitlinks */ |
Linus Torvalds | f35a6d3 | 2007-04-09 21:20:29 -0700 | [diff] [blame] | 239 | if (!S_ISDIR(st->st_mode)) |
| 240 | changed |= TYPE_CHANGED; |
| 241 | else if (ce_compare_gitlink(ce)) |
| 242 | changed |= DATA_CHANGED; |
Linus Torvalds | a8ee75b | 2007-04-13 09:24:13 -0700 | [diff] [blame] | 243 | return changed; |
Kay Sievers | 8ae0a8c | 2005-05-05 14:38:25 +0200 | [diff] [blame] | 244 | default: |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 245 | die("internal error: ce_mode is %o", ce->ce_mode); |
Kay Sievers | 8ae0a8c | 2005-05-05 14:38:25 +0200 | [diff] [blame] | 246 | } |
Linus Torvalds | ccc4feb | 2005-04-15 10:44:27 -0700 | [diff] [blame] | 247 | |
Michael Haggerty | c21d39d | 2013-06-20 10:37:50 +0200 | [diff] [blame] | 248 | changed |= match_stat_data(&ce->ce_stat_data, st); |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 249 | |
Linus Torvalds | f49c2c2 | 2008-06-10 10:44:43 -0700 | [diff] [blame] | 250 | /* Racily smudged entry? */ |
Michael Haggerty | c21d39d | 2013-06-20 10:37:50 +0200 | [diff] [blame] | 251 | if (!ce->ce_stat_data.sd_size) { |
Linus Torvalds | f49c2c2 | 2008-06-10 10:44:43 -0700 | [diff] [blame] | 252 | if (!is_empty_blob_sha1(ce->sha1)) |
| 253 | changed |= DATA_CHANGED; |
| 254 | } |
| 255 | |
Junio C Hamano | 407c8eb | 2005-12-20 12:12:18 -0800 | [diff] [blame] | 256 | return changed; |
| 257 | } |
| 258 | |
René Scharfe | 21a6b9f | 2013-06-02 17:46:52 +0200 | [diff] [blame] | 259 | static int is_racy_timestamp(const struct index_state *istate, |
| 260 | const struct cache_entry *ce) |
Junio C Hamano | 6d91da6 | 2008-01-21 00:44:50 -0800 | [diff] [blame] | 261 | { |
Junio C Hamano | 050288d | 2008-05-03 17:24:28 -0700 | [diff] [blame] | 262 | return (!S_ISGITLINK(ce->ce_mode) && |
Kjetil Barvik | fba2f38 | 2009-02-19 21:08:29 +0100 | [diff] [blame] | 263 | istate->timestamp.sec && |
| 264 | #ifdef USE_NSEC |
| 265 | /* nanosecond timestamped files can also be racy! */ |
Michael Haggerty | c21d39d | 2013-06-20 10:37:50 +0200 | [diff] [blame] | 266 | (istate->timestamp.sec < ce->ce_stat_data.sd_mtime.sec || |
| 267 | (istate->timestamp.sec == ce->ce_stat_data.sd_mtime.sec && |
| 268 | istate->timestamp.nsec <= ce->ce_stat_data.sd_mtime.nsec)) |
Kjetil Barvik | fba2f38 | 2009-02-19 21:08:29 +0100 | [diff] [blame] | 269 | #else |
Michael Haggerty | c21d39d | 2013-06-20 10:37:50 +0200 | [diff] [blame] | 270 | istate->timestamp.sec <= ce->ce_stat_data.sd_mtime.sec |
Kjetil Barvik | fba2f38 | 2009-02-19 21:08:29 +0100 | [diff] [blame] | 271 | #endif |
| 272 | ); |
Junio C Hamano | 6d91da6 | 2008-01-21 00:44:50 -0800 | [diff] [blame] | 273 | } |
| 274 | |
Linus Torvalds | d1f128b | 2008-03-06 12:46:09 -0800 | [diff] [blame] | 275 | int ie_match_stat(const struct index_state *istate, |
René Scharfe | 21a6b9f | 2013-06-02 17:46:52 +0200 | [diff] [blame] | 276 | const struct cache_entry *ce, struct stat *st, |
Junio C Hamano | 4bd5b7d | 2007-11-10 00:15:03 -0800 | [diff] [blame] | 277 | unsigned int options) |
Junio C Hamano | 407c8eb | 2005-12-20 12:12:18 -0800 | [diff] [blame] | 278 | { |
Junio C Hamano | 5f73076 | 2006-02-08 21:15:24 -0800 | [diff] [blame] | 279 | unsigned int changed; |
Junio C Hamano | 4bd5b7d | 2007-11-10 00:15:03 -0800 | [diff] [blame] | 280 | 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] | 281 | int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE; |
Junio C Hamano | 4bd5b7d | 2007-11-10 00:15:03 -0800 | [diff] [blame] | 282 | int assume_racy_is_modified = options & CE_MATCH_RACY_IS_DIRTY; |
Junio C Hamano | 5f73076 | 2006-02-08 21:15:24 -0800 | [diff] [blame] | 283 | |
| 284 | /* |
| 285 | * If it's marked as always valid in the index, it's |
| 286 | * valid whatever the checked-out copy says. |
Nguyễn Thái Ngọc Duy | 56cac48 | 2009-12-14 18:43:58 +0700 | [diff] [blame] | 287 | * |
| 288 | * skip-worktree has the same effect with higher precedence |
Junio C Hamano | 5f73076 | 2006-02-08 21:15:24 -0800 | [diff] [blame] | 289 | */ |
Nguyễn Thái Ngọc Duy | 56cac48 | 2009-12-14 18:43:58 +0700 | [diff] [blame] | 290 | if (!ignore_skip_worktree && ce_skip_worktree(ce)) |
| 291 | return 0; |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 292 | if (!ignore_valid && (ce->ce_flags & CE_VALID)) |
Junio C Hamano | 5f73076 | 2006-02-08 21:15:24 -0800 | [diff] [blame] | 293 | return 0; |
| 294 | |
Junio C Hamano | 331fcb5 | 2008-11-28 19:56:34 -0800 | [diff] [blame] | 295 | /* |
| 296 | * Intent-to-add entries have not been added, so the index entry |
| 297 | * by definition never matches what is in the work tree until it |
| 298 | * actually gets added. |
| 299 | */ |
| 300 | if (ce->ce_flags & CE_INTENT_TO_ADD) |
| 301 | return DATA_CHANGED | TYPE_CHANGED | MODE_CHANGED; |
| 302 | |
Junio C Hamano | 5f73076 | 2006-02-08 21:15:24 -0800 | [diff] [blame] | 303 | changed = ce_match_stat_basic(ce, st); |
Junio C Hamano | 407c8eb | 2005-12-20 12:12:18 -0800 | [diff] [blame] | 304 | |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 305 | /* |
| 306 | * Within 1 second of this sequence: |
| 307 | * echo xyzzy >file && git-update-index --add file |
| 308 | * running this command: |
| 309 | * echo frotz >file |
| 310 | * would give a falsely clean cache entry. The mtime and |
| 311 | * length match the cache, and other stat fields do not change. |
| 312 | * |
| 313 | * We could detect this at update-index time (the cache entry |
| 314 | * being registered/updated records the same time as "now") |
| 315 | * and delay the return from git-update-index, but that would |
| 316 | * effectively mean we can make at most one commit per second, |
| 317 | * which is not acceptable. Instead, we check cache entries |
| 318 | * whose mtime are the same as the index file timestamp more |
Junio C Hamano | 5f73076 | 2006-02-08 21:15:24 -0800 | [diff] [blame] | 319 | * carefully than others. |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 320 | */ |
Junio C Hamano | 6d91da6 | 2008-01-21 00:44:50 -0800 | [diff] [blame] | 321 | if (!changed && is_racy_timestamp(istate, ce)) { |
Junio C Hamano | 42f7740 | 2006-08-15 21:38:07 -0700 | [diff] [blame] | 322 | if (assume_racy_is_modified) |
| 323 | changed |= DATA_CHANGED; |
| 324 | else |
| 325 | changed |= ce_modified_check_fs(ce, st); |
| 326 | } |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 327 | |
Linus Torvalds | 734aab7 | 2005-04-09 09:48:20 -0700 | [diff] [blame] | 328 | return changed; |
| 329 | } |
| 330 | |
Linus Torvalds | d1f128b | 2008-03-06 12:46:09 -0800 | [diff] [blame] | 331 | int ie_modified(const struct index_state *istate, |
René Scharfe | 21a6b9f | 2013-06-02 17:46:52 +0200 | [diff] [blame] | 332 | const struct cache_entry *ce, |
| 333 | struct stat *st, unsigned int options) |
Junio C Hamano | b039189 | 2005-09-19 15:11:15 -0700 | [diff] [blame] | 334 | { |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 335 | int changed, changed_fs; |
Junio C Hamano | 4bd5b7d | 2007-11-10 00:15:03 -0800 | [diff] [blame] | 336 | |
| 337 | changed = ie_match_stat(istate, ce, st, options); |
Junio C Hamano | b039189 | 2005-09-19 15:11:15 -0700 | [diff] [blame] | 338 | if (!changed) |
| 339 | return 0; |
Junio C Hamano | b039189 | 2005-09-19 15:11:15 -0700 | [diff] [blame] | 340 | /* |
| 341 | * If the mode or type has changed, there's no point in trying |
| 342 | * to refresh the entry - it's not going to match |
| 343 | */ |
| 344 | if (changed & (MODE_CHANGED | TYPE_CHANGED)) |
| 345 | return changed; |
| 346 | |
Junio C Hamano | c70115b | 2008-07-29 01:13:44 -0700 | [diff] [blame] | 347 | /* |
| 348 | * Immediately after read-tree or update-index --cacheinfo, |
| 349 | * the length field is zero, as we have never even read the |
| 350 | * lstat(2) information once, and we cannot trust DATA_CHANGED |
| 351 | * returned by ie_match_stat() which in turn was returned by |
| 352 | * ce_match_stat_basic() to signal that the filesize of the |
| 353 | * blob changed. We have to actually go to the filesystem to |
| 354 | * see if the contents match, and if so, should answer "unchanged". |
| 355 | * |
| 356 | * The logic does not apply to gitlinks, as ce_match_stat_basic() |
| 357 | * already has checked the actual HEAD from the filesystem in the |
| 358 | * subproject. If ie_match_stat() already said it is different, |
| 359 | * then we know it is. |
Junio C Hamano | b039189 | 2005-09-19 15:11:15 -0700 | [diff] [blame] | 360 | */ |
Junio C Hamano | c70115b | 2008-07-29 01:13:44 -0700 | [diff] [blame] | 361 | if ((changed & DATA_CHANGED) && |
Michael Haggerty | c21d39d | 2013-06-20 10:37:50 +0200 | [diff] [blame] | 362 | (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] | 363 | return changed; |
| 364 | |
Junio C Hamano | 29e4d36 | 2005-12-20 00:02:15 -0800 | [diff] [blame] | 365 | changed_fs = ce_modified_check_fs(ce, st); |
| 366 | if (changed_fs) |
| 367 | return changed | changed_fs; |
Junio C Hamano | b039189 | 2005-09-19 15:11:15 -0700 | [diff] [blame] | 368 | return 0; |
| 369 | } |
| 370 | |
Linus Torvalds | 958ba6c | 2005-05-20 09:09:18 -0700 | [diff] [blame] | 371 | int base_name_compare(const char *name1, int len1, int mode1, |
| 372 | const char *name2, int len2, int mode2) |
| 373 | { |
| 374 | unsigned char c1, c2; |
| 375 | int len = len1 < len2 ? len1 : len2; |
| 376 | int cmp; |
| 377 | |
| 378 | cmp = memcmp(name1, name2, len); |
| 379 | if (cmp) |
| 380 | return cmp; |
| 381 | c1 = name1[len]; |
| 382 | c2 = name2[len]; |
Linus Torvalds | 1833a92 | 2007-04-11 14:39:12 -0700 | [diff] [blame] | 383 | if (!c1 && S_ISDIR(mode1)) |
Linus Torvalds | 958ba6c | 2005-05-20 09:09:18 -0700 | [diff] [blame] | 384 | c1 = '/'; |
Linus Torvalds | 1833a92 | 2007-04-11 14:39:12 -0700 | [diff] [blame] | 385 | if (!c2 && S_ISDIR(mode2)) |
Linus Torvalds | 958ba6c | 2005-05-20 09:09:18 -0700 | [diff] [blame] | 386 | c2 = '/'; |
| 387 | return (c1 < c2) ? -1 : (c1 > c2) ? 1 : 0; |
| 388 | } |
| 389 | |
Linus Torvalds | 0ab9e1e | 2008-03-05 18:25:10 -0800 | [diff] [blame] | 390 | /* |
| 391 | * df_name_compare() is identical to base_name_compare(), except it |
| 392 | * compares conflicting directory/file entries as equal. Note that |
| 393 | * while a directory name compares as equal to a regular file, they |
| 394 | * then individually compare _differently_ to a filename that has |
| 395 | * a dot after the basename (because '\0' < '.' < '/'). |
| 396 | * |
| 397 | * This is used by routines that want to traverse the git namespace |
| 398 | * but then handle conflicting entries together when possible. |
| 399 | */ |
| 400 | int df_name_compare(const char *name1, int len1, int mode1, |
| 401 | const char *name2, int len2, int mode2) |
| 402 | { |
| 403 | int len = len1 < len2 ? len1 : len2, cmp; |
| 404 | unsigned char c1, c2; |
| 405 | |
| 406 | cmp = memcmp(name1, name2, len); |
| 407 | if (cmp) |
| 408 | return cmp; |
| 409 | /* Directories and files compare equal (same length, same name) */ |
| 410 | if (len1 == len2) |
| 411 | return 0; |
| 412 | c1 = name1[len]; |
| 413 | if (!c1 && S_ISDIR(mode1)) |
| 414 | c1 = '/'; |
| 415 | c2 = name2[len]; |
| 416 | if (!c2 && S_ISDIR(mode2)) |
| 417 | c2 = '/'; |
| 418 | if (c1 == '/' && !c2) |
| 419 | return 0; |
| 420 | if (c2 == '/' && !c1) |
| 421 | return 0; |
| 422 | return c1 - c2; |
| 423 | } |
| 424 | |
Thomas Gummerer | b60e188 | 2012-07-11 11:22:37 +0200 | [diff] [blame] | 425 | int cache_name_stage_compare(const char *name1, int len1, int stage1, const char *name2, int len2, int stage2) |
Linus Torvalds | eb38c22 | 2005-04-09 09:26:55 -0700 | [diff] [blame] | 426 | { |
Thomas Gummerer | b60e188 | 2012-07-11 11:22:37 +0200 | [diff] [blame] | 427 | int len = len1 < len2 ? len1 : len2; |
| 428 | int cmp; |
Linus Torvalds | eb38c22 | 2005-04-09 09:26:55 -0700 | [diff] [blame] | 429 | |
| 430 | cmp = memcmp(name1, name2, len); |
| 431 | if (cmp) |
| 432 | return cmp; |
| 433 | if (len1 < len2) |
| 434 | return -1; |
| 435 | if (len1 > len2) |
| 436 | return 1; |
Junio C Hamano | 5f73076 | 2006-02-08 21:15:24 -0800 | [diff] [blame] | 437 | |
Thomas Gummerer | b60e188 | 2012-07-11 11:22:37 +0200 | [diff] [blame] | 438 | if (stage1 < stage2) |
Linus Torvalds | 95fd5bf | 2005-04-15 22:51:44 -0700 | [diff] [blame] | 439 | return -1; |
Thomas Gummerer | b60e188 | 2012-07-11 11:22:37 +0200 | [diff] [blame] | 440 | if (stage1 > stage2) |
Linus Torvalds | 95fd5bf | 2005-04-15 22:51:44 -0700 | [diff] [blame] | 441 | return 1; |
Linus Torvalds | eb38c22 | 2005-04-09 09:26:55 -0700 | [diff] [blame] | 442 | return 0; |
| 443 | } |
| 444 | |
Thomas Gummerer | b60e188 | 2012-07-11 11:22:37 +0200 | [diff] [blame] | 445 | int cache_name_compare(const char *name1, int len1, const char *name2, int len2) |
| 446 | { |
| 447 | return cache_name_stage_compare(name1, len1, 0, name2, len2, 0); |
| 448 | } |
| 449 | |
Junio C Hamano | 357e9c6 | 2012-09-15 22:44:31 -0700 | [diff] [blame] | 450 | 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] | 451 | { |
| 452 | int first, last; |
| 453 | |
| 454 | first = 0; |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 455 | last = istate->cache_nr; |
Linus Torvalds | eb38c22 | 2005-04-09 09:26:55 -0700 | [diff] [blame] | 456 | while (last > first) { |
| 457 | int next = (last + first) >> 1; |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 458 | struct cache_entry *ce = istate->cache[next]; |
Thomas Gummerer | b60e188 | 2012-07-11 11:22:37 +0200 | [diff] [blame] | 459 | 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] | 460 | if (!cmp) |
Linus Torvalds | 76e7f4e | 2005-04-10 22:06:50 -0700 | [diff] [blame] | 461 | return next; |
Linus Torvalds | eb38c22 | 2005-04-09 09:26:55 -0700 | [diff] [blame] | 462 | if (cmp < 0) { |
| 463 | last = next; |
| 464 | continue; |
| 465 | } |
| 466 | first = next+1; |
| 467 | } |
Linus Torvalds | 76e7f4e | 2005-04-10 22:06:50 -0700 | [diff] [blame] | 468 | return -first-1; |
Linus Torvalds | eb38c22 | 2005-04-09 09:26:55 -0700 | [diff] [blame] | 469 | } |
| 470 | |
Thomas Gummerer | b60e188 | 2012-07-11 11:22:37 +0200 | [diff] [blame] | 471 | int index_name_pos(const struct index_state *istate, const char *name, int namelen) |
| 472 | { |
| 473 | return index_name_stage_pos(istate, name, namelen, 0); |
| 474 | } |
| 475 | |
Linus Torvalds | 7b937ca | 2005-04-16 12:05:45 -0700 | [diff] [blame] | 476 | /* Remove entry, return true if there are more entries to go.. */ |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 477 | int remove_index_entry_at(struct index_state *istate, int pos) |
Linus Torvalds | 7b937ca | 2005-04-16 12:05:45 -0700 | [diff] [blame] | 478 | { |
Linus Torvalds | cf55870 | 2008-01-22 18:41:14 -0800 | [diff] [blame] | 479 | struct cache_entry *ce = istate->cache[pos]; |
| 480 | |
Junio C Hamano | cfc5789 | 2009-12-25 00:30:51 -0800 | [diff] [blame] | 481 | record_resolve_undo(istate, ce); |
Karsten Blees | 2092678 | 2013-02-28 00:57:48 +0100 | [diff] [blame] | 482 | remove_name_hash(istate, ce); |
Karsten Blees | 5699d17 | 2013-11-14 20:24:37 +0100 | [diff] [blame] | 483 | free(ce); |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 484 | istate->cache_changed = 1; |
| 485 | istate->cache_nr--; |
| 486 | if (pos >= istate->cache_nr) |
Linus Torvalds | 7b937ca | 2005-04-16 12:05:45 -0700 | [diff] [blame] | 487 | return 0; |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 488 | memmove(istate->cache + pos, |
| 489 | istate->cache + pos + 1, |
| 490 | (istate->cache_nr - pos) * sizeof(struct cache_entry *)); |
Linus Torvalds | 7b937ca | 2005-04-16 12:05:45 -0700 | [diff] [blame] | 491 | return 1; |
| 492 | } |
| 493 | |
Kjetil Barvik | 36419c8 | 2009-02-18 23:18:03 +0100 | [diff] [blame] | 494 | /* |
Ondřej Bílka | 98e023d | 2013-07-29 10:18:21 +0200 | [diff] [blame] | 495 | * Remove all cache entries marked for removal, that is where |
Kjetil Barvik | 36419c8 | 2009-02-18 23:18:03 +0100 | [diff] [blame] | 496 | * CE_REMOVE is set in ce_flags. This is much more effective than |
| 497 | * calling remove_index_entry_at() for each entry to be removed. |
| 498 | */ |
| 499 | void remove_marked_cache_entries(struct index_state *istate) |
| 500 | { |
| 501 | struct cache_entry **ce_array = istate->cache; |
| 502 | unsigned int i, j; |
| 503 | |
| 504 | for (i = j = 0; i < istate->cache_nr; i++) { |
Karsten Blees | 5699d17 | 2013-11-14 20:24:37 +0100 | [diff] [blame] | 505 | if (ce_array[i]->ce_flags & CE_REMOVE) { |
Karsten Blees | 2092678 | 2013-02-28 00:57:48 +0100 | [diff] [blame] | 506 | remove_name_hash(istate, ce_array[i]); |
Karsten Blees | 5699d17 | 2013-11-14 20:24:37 +0100 | [diff] [blame] | 507 | free(ce_array[i]); |
| 508 | } |
Kjetil Barvik | 36419c8 | 2009-02-18 23:18:03 +0100 | [diff] [blame] | 509 | else |
| 510 | ce_array[j++] = ce_array[i]; |
| 511 | } |
| 512 | istate->cache_changed = 1; |
| 513 | istate->cache_nr = j; |
| 514 | } |
| 515 | |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 516 | int remove_file_from_index(struct index_state *istate, const char *path) |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 517 | { |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 518 | int pos = index_name_pos(istate, path, strlen(path)); |
Junio C Hamano | c4e3cca | 2005-04-17 09:53:35 -0700 | [diff] [blame] | 519 | if (pos < 0) |
| 520 | pos = -pos-1; |
Junio C Hamano | 09d5dc3 | 2007-09-13 20:33:11 -0700 | [diff] [blame] | 521 | cache_tree_invalidate_path(istate->cache_tree, path); |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 522 | while (pos < istate->cache_nr && !strcmp(istate->cache[pos]->name, path)) |
| 523 | remove_index_entry_at(istate, pos); |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 524 | return 0; |
| 525 | } |
| 526 | |
Johannes Schindelin | 2031427 | 2007-06-29 18:32:46 +0100 | [diff] [blame] | 527 | static int compare_name(struct cache_entry *ce, const char *path, int namelen) |
| 528 | { |
| 529 | return namelen != ce_namelen(ce) || memcmp(path, ce->name, namelen); |
| 530 | } |
| 531 | |
| 532 | static int index_name_pos_also_unmerged(struct index_state *istate, |
| 533 | const char *path, int namelen) |
| 534 | { |
| 535 | int pos = index_name_pos(istate, path, namelen); |
| 536 | struct cache_entry *ce; |
| 537 | |
| 538 | if (pos >= 0) |
| 539 | return pos; |
| 540 | |
| 541 | /* maybe unmerged? */ |
| 542 | pos = -1 - pos; |
| 543 | if (pos >= istate->cache_nr || |
| 544 | compare_name((ce = istate->cache[pos]), path, namelen)) |
| 545 | return -1; |
| 546 | |
| 547 | /* order of preference: stage 2, 1, 3 */ |
| 548 | if (ce_stage(ce) == 1 && pos + 1 < istate->cache_nr && |
| 549 | ce_stage((ce = istate->cache[pos + 1])) == 2 && |
| 550 | !compare_name(ce, path, namelen)) |
| 551 | pos++; |
| 552 | return pos; |
| 553 | } |
| 554 | |
Linus Torvalds | 1102952 | 2008-03-22 14:22:44 -0700 | [diff] [blame] | 555 | static int different_name(struct cache_entry *ce, struct cache_entry *alias) |
| 556 | { |
| 557 | int len = ce_namelen(ce); |
| 558 | return ce_namelen(alias) != len || memcmp(ce->name, alias->name, len); |
| 559 | } |
| 560 | |
| 561 | /* |
| 562 | * If we add a filename that aliases in the cache, we will use the |
| 563 | * name that we already have - but we don't want to update the same |
| 564 | * alias twice, because that implies that there were actually two |
| 565 | * different files with aliasing names! |
| 566 | * |
| 567 | * So we use the CE_ADDED flag to verify that the alias was an old |
| 568 | * one before we accept it as |
| 569 | */ |
| 570 | static struct cache_entry *create_alias_ce(struct cache_entry *ce, struct cache_entry *alias) |
| 571 | { |
| 572 | int len; |
| 573 | struct cache_entry *new; |
| 574 | |
| 575 | if (alias->ce_flags & CE_ADDED) |
| 576 | die("Will not add file alias '%s' ('%s' already exists in index)", ce->name, alias->name); |
| 577 | |
| 578 | /* Ok, create the new entry using the name of the existing alias */ |
| 579 | len = ce_namelen(alias); |
| 580 | new = xcalloc(1, cache_entry_size(len)); |
| 581 | memcpy(new->name, alias->name, len); |
| 582 | copy_cache_entry(new, ce); |
| 583 | free(ce); |
| 584 | return new; |
| 585 | } |
| 586 | |
Nguyễn Thái Ngọc Duy | b4b313f | 2014-02-04 09:20:09 +0700 | [diff] [blame] | 587 | 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] | 588 | { |
| 589 | unsigned char sha1[20]; |
| 590 | if (write_sha1_file("", 0, blob_type, sha1)) |
| 591 | die("cannot create an empty blob in the object database"); |
| 592 | hashcpy(ce->sha1, sha1); |
| 593 | } |
| 594 | |
Junio C Hamano | 38ed1d8 | 2008-05-21 12:04:34 -0700 | [diff] [blame] | 595 | 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] | 596 | { |
Junio C Hamano | 38ed1d8 | 2008-05-21 12:04:34 -0700 | [diff] [blame] | 597 | int size, namelen, was_same; |
Linus Torvalds | d177cab | 2008-05-09 09:11:43 -0700 | [diff] [blame] | 598 | mode_t st_mode = st->st_mode; |
Linus Torvalds | 6835550 | 2008-03-22 13:19:49 -0700 | [diff] [blame] | 599 | struct cache_entry *ce, *alias; |
Nguyễn Thái Ngọc Duy | 56cac48 | 2009-12-14 18:43:58 +0700 | [diff] [blame] | 600 | 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] | 601 | int verbose = flags & (ADD_CACHE_VERBOSE | ADD_CACHE_PRETEND); |
| 602 | int pretend = flags & ADD_CACHE_PRETEND; |
Junio C Hamano | 3942581 | 2008-08-21 01:44:53 -0700 | [diff] [blame] | 603 | int intent_only = flags & ADD_CACHE_INTENT; |
| 604 | int add_option = (ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE| |
| 605 | (intent_only ? ADD_CACHE_NEW_ONLY : 0)); |
Johannes Schindelin | 11be42a | 2006-07-26 03:52:35 +0200 | [diff] [blame] | 606 | |
Linus Torvalds | d177cab | 2008-05-09 09:11:43 -0700 | [diff] [blame] | 607 | 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] | 608 | 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] | 609 | |
| 610 | namelen = strlen(path); |
Linus Torvalds | d177cab | 2008-05-09 09:11:43 -0700 | [diff] [blame] | 611 | if (S_ISDIR(st_mode)) { |
Linus Torvalds | 0959525 | 2007-04-11 14:49:44 -0700 | [diff] [blame] | 612 | while (namelen && path[namelen-1] == '/') |
| 613 | namelen--; |
| 614 | } |
Johannes Schindelin | 11be42a | 2006-07-26 03:52:35 +0200 | [diff] [blame] | 615 | size = cache_entry_size(namelen); |
| 616 | ce = xcalloc(1, size); |
| 617 | memcpy(ce->name, path, namelen); |
Thomas Gummerer | b60e188 | 2012-07-11 11:22:37 +0200 | [diff] [blame] | 618 | ce->ce_namelen = namelen; |
Junio C Hamano | 3942581 | 2008-08-21 01:44:53 -0700 | [diff] [blame] | 619 | if (!intent_only) |
| 620 | fill_stat_cache_info(ce, st); |
Junio C Hamano | 388b2ac | 2008-11-28 19:55:25 -0800 | [diff] [blame] | 621 | else |
| 622 | ce->ce_flags |= CE_INTENT_TO_ADD; |
Johannes Schindelin | 11be42a | 2006-07-26 03:52:35 +0200 | [diff] [blame] | 623 | |
Johannes Sixt | 78a8d64 | 2007-03-02 22:11:30 +0100 | [diff] [blame] | 624 | if (trust_executable_bit && has_symlinks) |
Linus Torvalds | d177cab | 2008-05-09 09:11:43 -0700 | [diff] [blame] | 625 | ce->ce_mode = create_ce_mode(st_mode); |
Junio C Hamano | 185c975 | 2007-02-16 22:43:48 -0800 | [diff] [blame] | 626 | else { |
Johannes Sixt | 78a8d64 | 2007-03-02 22:11:30 +0100 | [diff] [blame] | 627 | /* If there is an existing entry, pick the mode bits and type |
| 628 | * from it, otherwise assume unexecutable regular file. |
Johannes Schindelin | 11be42a | 2006-07-26 03:52:35 +0200 | [diff] [blame] | 629 | */ |
Junio C Hamano | 185c975 | 2007-02-16 22:43:48 -0800 | [diff] [blame] | 630 | struct cache_entry *ent; |
Johannes Schindelin | 2031427 | 2007-06-29 18:32:46 +0100 | [diff] [blame] | 631 | int pos = index_name_pos_also_unmerged(istate, path, namelen); |
Junio C Hamano | 185c975 | 2007-02-16 22:43:48 -0800 | [diff] [blame] | 632 | |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 633 | ent = (0 <= pos) ? istate->cache[pos] : NULL; |
Linus Torvalds | d177cab | 2008-05-09 09:11:43 -0700 | [diff] [blame] | 634 | ce->ce_mode = ce_mode_from_stat(ent, st_mode); |
Johannes Schindelin | 11be42a | 2006-07-26 03:52:35 +0200 | [diff] [blame] | 635 | } |
| 636 | |
Joshua Jensen | dc1ae70 | 2010-10-03 09:56:45 +0000 | [diff] [blame] | 637 | /* When core.ignorecase=true, determine if a directory of the same name but differing |
| 638 | * case already exists within the Git repository. If it does, ensure the directory |
| 639 | * case of the file being added to the repository matches (is folded into) the existing |
| 640 | * entry's directory case. |
| 641 | */ |
| 642 | if (ignore_case) { |
| 643 | const char *startPtr = ce->name; |
| 644 | const char *ptr = startPtr; |
| 645 | while (*ptr) { |
| 646 | while (*ptr && *ptr != '/') |
| 647 | ++ptr; |
| 648 | if (*ptr == '/') { |
| 649 | struct cache_entry *foundce; |
| 650 | ++ptr; |
Eric Sunshine | d28eec2 | 2013-09-17 03:06:16 -0400 | [diff] [blame] | 651 | foundce = index_dir_exists(istate, ce->name, ptr - ce->name - 1); |
Joshua Jensen | dc1ae70 | 2010-10-03 09:56:45 +0000 | [diff] [blame] | 652 | if (foundce) { |
| 653 | memcpy((void *)startPtr, foundce->name + (startPtr - ce->name), ptr - startPtr); |
| 654 | startPtr = ptr; |
| 655 | } |
| 656 | } |
| 657 | } |
| 658 | } |
| 659 | |
Eric Sunshine | ebbd743 | 2013-09-17 03:06:15 -0400 | [diff] [blame] | 660 | alias = index_file_exists(istate, ce->name, ce_namelen(ce), ignore_case); |
Linus Torvalds | d177cab | 2008-05-09 09:11:43 -0700 | [diff] [blame] | 661 | if (alias && !ce_stage(alias) && !ie_match_stat(istate, alias, st, ce_option)) { |
Junio C Hamano | 0781b8a | 2007-07-30 17:12:58 -0700 | [diff] [blame] | 662 | /* Nothing changed, really */ |
| 663 | free(ce); |
Junio C Hamano | 125fd98 | 2010-01-24 00:10:20 -0800 | [diff] [blame] | 664 | if (!S_ISGITLINK(alias->ce_mode)) |
| 665 | ce_mark_uptodate(alias); |
Linus Torvalds | 1102952 | 2008-03-22 14:22:44 -0700 | [diff] [blame] | 666 | alias->ce_flags |= CE_ADDED; |
Junio C Hamano | 0781b8a | 2007-07-30 17:12:58 -0700 | [diff] [blame] | 667 | return 0; |
| 668 | } |
Junio C Hamano | 3942581 | 2008-08-21 01:44:53 -0700 | [diff] [blame] | 669 | if (!intent_only) { |
Junio C Hamano | c4ce46f | 2011-05-08 01:47:33 -0700 | [diff] [blame] | 670 | if (index_path(ce->sha1, path, st, HASH_WRITE_OBJECT)) |
Junio C Hamano | 3942581 | 2008-08-21 01:44:53 -0700 | [diff] [blame] | 671 | return error("unable to index file %s", path); |
| 672 | } else |
Nguyễn Thái Ngọc Duy | b4b313f | 2014-02-04 09:20:09 +0700 | [diff] [blame] | 673 | set_object_name_for_intent_to_add_entry(ce); |
Junio C Hamano | 3942581 | 2008-08-21 01:44:53 -0700 | [diff] [blame] | 674 | |
Linus Torvalds | 1102952 | 2008-03-22 14:22:44 -0700 | [diff] [blame] | 675 | if (ignore_case && alias && different_name(ce, alias)) |
| 676 | ce = create_alias_ce(ce, alias); |
| 677 | ce->ce_flags |= CE_ADDED; |
Junio C Hamano | 38ed1d8 | 2008-05-21 12:04:34 -0700 | [diff] [blame] | 678 | |
Junio C Hamano | 3bf0dd1 | 2008-07-16 18:48:58 -0700 | [diff] [blame] | 679 | /* 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] | 680 | was_same = (alias && |
| 681 | !ce_stage(alias) && |
| 682 | !hashcmp(alias->sha1, ce->sha1) && |
| 683 | ce->ce_mode == alias->ce_mode); |
| 684 | |
| 685 | if (pretend) |
| 686 | ; |
Junio C Hamano | 3942581 | 2008-08-21 01:44:53 -0700 | [diff] [blame] | 687 | else if (add_index_entry(istate, ce, add_option)) |
Alex Riesen | 960b8ad | 2008-05-12 19:57:45 +0200 | [diff] [blame] | 688 | return error("unable to add %s to index",path); |
Junio C Hamano | 38ed1d8 | 2008-05-21 12:04:34 -0700 | [diff] [blame] | 689 | if (verbose && !was_same) |
Johannes Schindelin | 11be42a | 2006-07-26 03:52:35 +0200 | [diff] [blame] | 690 | printf("add '%s'\n", path); |
Johannes Schindelin | 11be42a | 2006-07-26 03:52:35 +0200 | [diff] [blame] | 691 | return 0; |
| 692 | } |
| 693 | |
Junio C Hamano | 38ed1d8 | 2008-05-21 12:04:34 -0700 | [diff] [blame] | 694 | 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] | 695 | { |
| 696 | struct stat st; |
| 697 | if (lstat(path, &st)) |
Thomas Rast | d824cbb | 2009-06-27 17:58:46 +0200 | [diff] [blame] | 698 | die_errno("unable to stat '%s'", path); |
Junio C Hamano | 38ed1d8 | 2008-05-21 12:04:34 -0700 | [diff] [blame] | 699 | return add_to_index(istate, path, &st, flags); |
Linus Torvalds | d177cab | 2008-05-09 09:11:43 -0700 | [diff] [blame] | 700 | } |
| 701 | |
Carlos Rica | 6640f88 | 2007-09-11 05:17:28 +0200 | [diff] [blame] | 702 | struct cache_entry *make_cache_entry(unsigned int mode, |
| 703 | const unsigned char *sha1, const char *path, int stage, |
Brad King | 2576272 | 2014-01-27 09:45:08 -0500 | [diff] [blame] | 704 | unsigned int refresh_options) |
Carlos Rica | 6640f88 | 2007-09-11 05:17:28 +0200 | [diff] [blame] | 705 | { |
| 706 | int size, len; |
| 707 | struct cache_entry *ce; |
| 708 | |
Dmitry Potapov | 7e7abea | 2008-10-11 20:39:37 +0400 | [diff] [blame] | 709 | if (!verify_path(path)) { |
| 710 | error("Invalid path '%s'", path); |
Carlos Rica | 6640f88 | 2007-09-11 05:17:28 +0200 | [diff] [blame] | 711 | return NULL; |
Dmitry Potapov | 7e7abea | 2008-10-11 20:39:37 +0400 | [diff] [blame] | 712 | } |
Carlos Rica | 6640f88 | 2007-09-11 05:17:28 +0200 | [diff] [blame] | 713 | |
| 714 | len = strlen(path); |
| 715 | size = cache_entry_size(len); |
| 716 | ce = xcalloc(1, size); |
| 717 | |
| 718 | hashcpy(ce->sha1, sha1); |
| 719 | memcpy(ce->name, path, len); |
Thomas Gummerer | b60e188 | 2012-07-11 11:22:37 +0200 | [diff] [blame] | 720 | ce->ce_flags = create_ce_flags(stage); |
| 721 | ce->ce_namelen = len; |
Carlos Rica | 6640f88 | 2007-09-11 05:17:28 +0200 | [diff] [blame] | 722 | ce->ce_mode = create_ce_mode(mode); |
| 723 | |
Brad King | 2576272 | 2014-01-27 09:45:08 -0500 | [diff] [blame] | 724 | return refresh_cache_entry(ce, refresh_options); |
Carlos Rica | 6640f88 | 2007-09-11 05:17:28 +0200 | [diff] [blame] | 725 | } |
| 726 | |
Nguyễn Thái Ngọc Duy | 9c5e6c8 | 2013-07-09 22:29:00 +0700 | [diff] [blame] | 727 | 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] | 728 | { |
| 729 | int len = ce_namelen(a); |
| 730 | return ce_namelen(b) == len && !memcmp(a->name, b->name, len); |
| 731 | } |
| 732 | |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 733 | /* |
Linus Torvalds | 8dcf39c | 2006-05-18 12:07:31 -0700 | [diff] [blame] | 734 | * We fundamentally don't like some paths: we don't want |
| 735 | * dot or dot-dot anywhere, and for obvious reasons don't |
| 736 | * want to recurse into ".git" either. |
| 737 | * |
| 738 | * Also, we don't want double slashes or slashes at the |
| 739 | * end that can make pathnames ambiguous. |
| 740 | */ |
| 741 | static int verify_dotfile(const char *rest) |
| 742 | { |
| 743 | /* |
| 744 | * The first character was '.', but that |
| 745 | * has already been discarded, we now test |
| 746 | * the rest. |
| 747 | */ |
Theo Niessink | e0f530f | 2011-06-08 14:04:41 +0200 | [diff] [blame] | 748 | |
Linus Torvalds | 8dcf39c | 2006-05-18 12:07:31 -0700 | [diff] [blame] | 749 | /* "." is not allowed */ |
Theo Niessink | e0f530f | 2011-06-08 14:04:41 +0200 | [diff] [blame] | 750 | if (*rest == '\0' || is_dir_sep(*rest)) |
Linus Torvalds | 8dcf39c | 2006-05-18 12:07:31 -0700 | [diff] [blame] | 751 | return 0; |
| 752 | |
Theo Niessink | e0f530f | 2011-06-08 14:04:41 +0200 | [diff] [blame] | 753 | switch (*rest) { |
Linus Torvalds | 8dcf39c | 2006-05-18 12:07:31 -0700 | [diff] [blame] | 754 | /* |
| 755 | * ".git" followed by NUL or slash is bad. This |
| 756 | * shares the path end test with the ".." case. |
| 757 | */ |
| 758 | case 'g': |
| 759 | if (rest[1] != 'i') |
| 760 | break; |
| 761 | if (rest[2] != 't') |
| 762 | break; |
| 763 | rest += 2; |
| 764 | /* fallthrough */ |
| 765 | case '.': |
Theo Niessink | e0f530f | 2011-06-08 14:04:41 +0200 | [diff] [blame] | 766 | if (rest[1] == '\0' || is_dir_sep(rest[1])) |
Linus Torvalds | 8dcf39c | 2006-05-18 12:07:31 -0700 | [diff] [blame] | 767 | return 0; |
| 768 | } |
| 769 | return 1; |
| 770 | } |
| 771 | |
| 772 | int verify_path(const char *path) |
| 773 | { |
| 774 | char c; |
| 775 | |
Erik Faye-Lund | 56948cb | 2011-05-27 18:00:40 +0200 | [diff] [blame] | 776 | if (has_dos_drive_prefix(path)) |
| 777 | return 0; |
| 778 | |
Linus Torvalds | 8dcf39c | 2006-05-18 12:07:31 -0700 | [diff] [blame] | 779 | goto inside; |
| 780 | for (;;) { |
| 781 | if (!c) |
| 782 | return 1; |
Erik Faye-Lund | 56948cb | 2011-05-27 18:00:40 +0200 | [diff] [blame] | 783 | if (is_dir_sep(c)) { |
Linus Torvalds | 8dcf39c | 2006-05-18 12:07:31 -0700 | [diff] [blame] | 784 | inside: |
| 785 | c = *path++; |
Junio C Hamano | 3bdf09c | 2011-06-06 20:49:06 -0700 | [diff] [blame] | 786 | if ((c == '.' && !verify_dotfile(path)) || |
| 787 | is_dir_sep(c) || c == '\0') |
| 788 | return 0; |
Linus Torvalds | 8dcf39c | 2006-05-18 12:07:31 -0700 | [diff] [blame] | 789 | } |
| 790 | c = *path++; |
| 791 | } |
| 792 | } |
| 793 | |
| 794 | /* |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 795 | * Do we have another file that has the beginning components being a |
| 796 | * proper superset of the name we're trying to add? |
| 797 | */ |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 798 | static int has_file_name(struct index_state *istate, |
| 799 | const struct cache_entry *ce, int pos, int ok_to_replace) |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 800 | { |
| 801 | int retval = 0; |
| 802 | int len = ce_namelen(ce); |
Junio C Hamano | b155725 | 2005-06-25 02:25:29 -0700 | [diff] [blame] | 803 | int stage = ce_stage(ce); |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 804 | const char *name = ce->name; |
| 805 | |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 806 | while (pos < istate->cache_nr) { |
| 807 | struct cache_entry *p = istate->cache[pos++]; |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 808 | |
| 809 | if (len >= ce_namelen(p)) |
| 810 | break; |
| 811 | if (memcmp(name, p->name, len)) |
| 812 | break; |
Junio C Hamano | b155725 | 2005-06-25 02:25:29 -0700 | [diff] [blame] | 813 | if (ce_stage(p) != stage) |
| 814 | continue; |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 815 | if (p->name[len] != '/') |
| 816 | continue; |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 817 | if (p->ce_flags & CE_REMOVE) |
Junio C Hamano | 21cd8d0 | 2007-03-30 01:55:37 -0700 | [diff] [blame] | 818 | continue; |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 819 | retval = -1; |
| 820 | if (!ok_to_replace) |
| 821 | break; |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 822 | remove_index_entry_at(istate, --pos); |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 823 | } |
| 824 | return retval; |
| 825 | } |
| 826 | |
| 827 | /* |
| 828 | * Do we have another file with a pathname that is a proper |
| 829 | * subset of the name we're trying to add? |
| 830 | */ |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 831 | static int has_dir_name(struct index_state *istate, |
| 832 | const struct cache_entry *ce, int pos, int ok_to_replace) |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 833 | { |
| 834 | int retval = 0; |
Junio C Hamano | b155725 | 2005-06-25 02:25:29 -0700 | [diff] [blame] | 835 | int stage = ce_stage(ce); |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 836 | const char *name = ce->name; |
| 837 | const char *slash = name + ce_namelen(ce); |
| 838 | |
| 839 | for (;;) { |
| 840 | int len; |
| 841 | |
| 842 | for (;;) { |
| 843 | if (*--slash == '/') |
| 844 | break; |
| 845 | if (slash <= ce->name) |
| 846 | return retval; |
| 847 | } |
| 848 | len = slash - name; |
| 849 | |
Thomas Gummerer | b60e188 | 2012-07-11 11:22:37 +0200 | [diff] [blame] | 850 | pos = index_name_stage_pos(istate, name, len, stage); |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 851 | if (pos >= 0) { |
Junio C Hamano | 21cd8d0 | 2007-03-30 01:55:37 -0700 | [diff] [blame] | 852 | /* |
| 853 | * Found one, but not so fast. This could |
| 854 | * be a marker that says "I was here, but |
| 855 | * I am being removed". Such an entry is |
| 856 | * not a part of the resulting tree, and |
| 857 | * it is Ok to have a directory at the same |
| 858 | * path. |
| 859 | */ |
Junio C Hamano | 077c48d | 2008-01-22 21:24:21 -0800 | [diff] [blame] | 860 | if (!(istate->cache[pos]->ce_flags & CE_REMOVE)) { |
Junio C Hamano | 21cd8d0 | 2007-03-30 01:55:37 -0700 | [diff] [blame] | 861 | retval = -1; |
| 862 | if (!ok_to_replace) |
| 863 | break; |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 864 | remove_index_entry_at(istate, pos); |
Junio C Hamano | 21cd8d0 | 2007-03-30 01:55:37 -0700 | [diff] [blame] | 865 | continue; |
| 866 | } |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 867 | } |
Junio C Hamano | 21cd8d0 | 2007-03-30 01:55:37 -0700 | [diff] [blame] | 868 | else |
| 869 | pos = -pos-1; |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 870 | |
| 871 | /* |
| 872 | * Trivial optimization: if we find an entry that |
| 873 | * already matches the sub-directory, then we know |
Junio C Hamano | b155725 | 2005-06-25 02:25:29 -0700 | [diff] [blame] | 874 | * we're ok, and we can exit. |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 875 | */ |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 876 | while (pos < istate->cache_nr) { |
| 877 | struct cache_entry *p = istate->cache[pos]; |
Junio C Hamano | b155725 | 2005-06-25 02:25:29 -0700 | [diff] [blame] | 878 | if ((ce_namelen(p) <= len) || |
| 879 | (p->name[len] != '/') || |
| 880 | memcmp(p->name, name, len)) |
| 881 | break; /* not our subdirectory */ |
Junio C Hamano | 077c48d | 2008-01-22 21:24:21 -0800 | [diff] [blame] | 882 | if (ce_stage(p) == stage && !(p->ce_flags & CE_REMOVE)) |
| 883 | /* |
| 884 | * p is at the same stage as our entry, and |
Junio C Hamano | b155725 | 2005-06-25 02:25:29 -0700 | [diff] [blame] | 885 | * is a subdirectory of what we are looking |
| 886 | * at, so we cannot have conflicts at our |
| 887 | * level or anything shorter. |
| 888 | */ |
| 889 | return retval; |
| 890 | pos++; |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 891 | } |
| 892 | } |
| 893 | return retval; |
| 894 | } |
| 895 | |
Junio C Hamano | 0f1e4f0 | 2005-05-07 21:48:12 -0700 | [diff] [blame] | 896 | /* We may be in a situation where we already have path/file and path |
| 897 | * is being added, or we already have path and path/file is being |
| 898 | * added. Either one would result in a nonsense tree that has path |
| 899 | * 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] | 900 | * |
Junio C Hamano | 192268c | 2005-05-07 21:55:21 -0700 | [diff] [blame] | 901 | * If ok-to-replace is specified, we remove the conflicting entries |
| 902 | * from the cache so the caller should recompute the insert position. |
| 903 | * When this happens, we return non-zero. |
Junio C Hamano | 0f1e4f0 | 2005-05-07 21:48:12 -0700 | [diff] [blame] | 904 | */ |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 905 | static int check_file_directory_conflict(struct index_state *istate, |
| 906 | const struct cache_entry *ce, |
| 907 | int pos, int ok_to_replace) |
Junio C Hamano | 0f1e4f0 | 2005-05-07 21:48:12 -0700 | [diff] [blame] | 908 | { |
Junio C Hamano | 21cd8d0 | 2007-03-30 01:55:37 -0700 | [diff] [blame] | 909 | int retval; |
| 910 | |
| 911 | /* |
| 912 | * When ce is an "I am going away" entry, we allow it to be added |
| 913 | */ |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 914 | if (ce->ce_flags & CE_REMOVE) |
Junio C Hamano | 21cd8d0 | 2007-03-30 01:55:37 -0700 | [diff] [blame] | 915 | return 0; |
| 916 | |
Junio C Hamano | 0f1e4f0 | 2005-05-07 21:48:12 -0700 | [diff] [blame] | 917 | /* |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 918 | * We check if the path is a sub-path of a subsequent pathname |
| 919 | * first, since removing those will not change the position |
Junio C Hamano | 21cd8d0 | 2007-03-30 01:55:37 -0700 | [diff] [blame] | 920 | * in the array. |
Junio C Hamano | 0f1e4f0 | 2005-05-07 21:48:12 -0700 | [diff] [blame] | 921 | */ |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 922 | retval = has_file_name(istate, ce, pos, ok_to_replace); |
Junio C Hamano | 21cd8d0 | 2007-03-30 01:55:37 -0700 | [diff] [blame] | 923 | |
Linus Torvalds | 1267660 | 2005-06-18 20:21:34 -0700 | [diff] [blame] | 924 | /* |
| 925 | * Then check if the path might have a clashing sub-directory |
| 926 | * before it. |
Junio C Hamano | 0f1e4f0 | 2005-05-07 21:48:12 -0700 | [diff] [blame] | 927 | */ |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 928 | return retval + has_dir_name(istate, ce, pos, ok_to_replace); |
Junio C Hamano | 0f1e4f0 | 2005-05-07 21:48:12 -0700 | [diff] [blame] | 929 | } |
| 930 | |
Junio C Hamano | af3785d | 2007-08-09 13:42:50 -0700 | [diff] [blame] | 931 | 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] | 932 | { |
| 933 | int pos; |
Junio C Hamano | 192268c | 2005-05-07 21:55:21 -0700 | [diff] [blame] | 934 | int ok_to_add = option & ADD_CACHE_OK_TO_ADD; |
| 935 | int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE; |
Junio C Hamano | b155725 | 2005-06-25 02:25:29 -0700 | [diff] [blame] | 936 | int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK; |
Junio C Hamano | 3942581 | 2008-08-21 01:44:53 -0700 | [diff] [blame] | 937 | int new_only = option & ADD_CACHE_NEW_ONLY; |
Junio C Hamano | 5f73076 | 2006-02-08 21:15:24 -0800 | [diff] [blame] | 938 | |
Junio C Hamano | 09d5dc3 | 2007-09-13 20:33:11 -0700 | [diff] [blame] | 939 | cache_tree_invalidate_path(istate->cache_tree, ce->name); |
Thomas Gummerer | b60e188 | 2012-07-11 11:22:37 +0200 | [diff] [blame] | 940 | 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] | 941 | |
Junio C Hamano | 3e09cdf | 2005-10-11 18:45:33 -0700 | [diff] [blame] | 942 | /* existing match? Just replace it. */ |
Linus Torvalds | 76e7f4e | 2005-04-10 22:06:50 -0700 | [diff] [blame] | 943 | if (pos >= 0) { |
Junio C Hamano | 3942581 | 2008-08-21 01:44:53 -0700 | [diff] [blame] | 944 | if (!new_only) |
| 945 | replace_index_entry(istate, pos, ce); |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 946 | return 0; |
| 947 | } |
Linus Torvalds | 76e7f4e | 2005-04-10 22:06:50 -0700 | [diff] [blame] | 948 | pos = -pos-1; |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 949 | |
Linus Torvalds | 7b937ca | 2005-04-16 12:05:45 -0700 | [diff] [blame] | 950 | /* |
| 951 | * Inserting a merged entry ("stage 0") into the index |
| 952 | * will always replace all non-merged entries.. |
| 953 | */ |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 954 | if (pos < istate->cache_nr && ce_stage(ce) == 0) { |
| 955 | while (ce_same_name(istate->cache[pos], ce)) { |
Linus Torvalds | 7b937ca | 2005-04-16 12:05:45 -0700 | [diff] [blame] | 956 | ok_to_add = 1; |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 957 | if (!remove_index_entry_at(istate, pos)) |
Linus Torvalds | 7b937ca | 2005-04-16 12:05:45 -0700 | [diff] [blame] | 958 | break; |
| 959 | } |
| 960 | } |
| 961 | |
Linus Torvalds | 121481a | 2005-04-10 11:32:54 -0700 | [diff] [blame] | 962 | if (!ok_to_add) |
| 963 | return -1; |
Linus Torvalds | 8dcf39c | 2006-05-18 12:07:31 -0700 | [diff] [blame] | 964 | if (!verify_path(ce->name)) |
Dmitry Potapov | 7e7abea | 2008-10-11 20:39:37 +0400 | [diff] [blame] | 965 | return error("Invalid path '%s'", ce->name); |
Linus Torvalds | 121481a | 2005-04-10 11:32:54 -0700 | [diff] [blame] | 966 | |
Junio C Hamano | 3e09cdf | 2005-10-11 18:45:33 -0700 | [diff] [blame] | 967 | if (!skip_df_check && |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 968 | check_file_directory_conflict(istate, ce, pos, ok_to_replace)) { |
Junio C Hamano | 192268c | 2005-05-07 21:55:21 -0700 | [diff] [blame] | 969 | if (!ok_to_replace) |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 970 | return error("'%s' appears as both a file and as a directory", |
| 971 | ce->name); |
Thomas Gummerer | b60e188 | 2012-07-11 11:22:37 +0200 | [diff] [blame] | 972 | 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] | 973 | pos = -pos-1; |
| 974 | } |
Junio C Hamano | af3785d | 2007-08-09 13:42:50 -0700 | [diff] [blame] | 975 | return pos + 1; |
| 976 | } |
| 977 | |
| 978 | int add_index_entry(struct index_state *istate, struct cache_entry *ce, int option) |
| 979 | { |
| 980 | int pos; |
| 981 | |
| 982 | if (option & ADD_CACHE_JUST_APPEND) |
| 983 | pos = istate->cache_nr; |
| 984 | else { |
| 985 | int ret; |
| 986 | ret = add_index_entry_with_check(istate, ce, option); |
| 987 | if (ret <= 0) |
| 988 | return ret; |
| 989 | pos = ret - 1; |
| 990 | } |
Junio C Hamano | 0f1e4f0 | 2005-05-07 21:48:12 -0700 | [diff] [blame] | 991 | |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 992 | /* Make sure the array is big enough .. */ |
Dmitry S. Dolzhenko | 999f566 | 2014-03-04 02:32:01 +0400 | [diff] [blame] | 993 | ALLOC_GROW(istate->cache, istate->cache_nr + 1, istate->cache_alloc); |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 994 | |
| 995 | /* Add it in.. */ |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 996 | istate->cache_nr++; |
Junio C Hamano | af3785d | 2007-08-09 13:42:50 -0700 | [diff] [blame] | 997 | if (istate->cache_nr > pos + 1) |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 998 | memmove(istate->cache + pos + 1, |
| 999 | istate->cache + pos, |
| 1000 | (istate->cache_nr - pos - 1) * sizeof(ce)); |
Linus Torvalds | cf55870 | 2008-01-22 18:41:14 -0800 | [diff] [blame] | 1001 | set_index_entry(istate, pos, ce); |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1002 | istate->cache_changed = 1; |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 1003 | return 0; |
| 1004 | } |
| 1005 | |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1006 | /* |
| 1007 | * "refresh" does not calculate a new sha1 file or bring the |
| 1008 | * cache up-to-date for mode/content changes. But what it |
| 1009 | * _does_ do is to "re-match" the stat information of a file |
| 1010 | * with the cache, so that you can refresh the cache for a |
| 1011 | * file that hasn't been changed but where the stat entry is |
| 1012 | * out of date. |
| 1013 | * |
| 1014 | * For example, you'd want to do this after doing a "git-read-tree", |
| 1015 | * to link up the stat cache details with the proper files. |
| 1016 | */ |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1017 | static struct cache_entry *refresh_cache_ent(struct index_state *istate, |
Junio C Hamano | 4bd5b7d | 2007-11-10 00:15:03 -0800 | [diff] [blame] | 1018 | struct cache_entry *ce, |
Jeff King | d05e697 | 2011-11-18 06:11:08 -0500 | [diff] [blame] | 1019 | unsigned int options, int *err, |
| 1020 | int *changed_ret) |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1021 | { |
| 1022 | struct stat st; |
| 1023 | struct cache_entry *updated; |
| 1024 | int changed, size; |
Brad King | 2576272 | 2014-01-27 09:45:08 -0500 | [diff] [blame] | 1025 | int refresh = options & CE_MATCH_REFRESH; |
Junio C Hamano | 4bd5b7d | 2007-11-10 00:15:03 -0800 | [diff] [blame] | 1026 | 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] | 1027 | int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE; |
Brad King | 2e2e7ec | 2014-01-27 09:45:07 -0500 | [diff] [blame] | 1028 | int ignore_missing = options & CE_MATCH_IGNORE_MISSING; |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1029 | |
Brad King | 2576272 | 2014-01-27 09:45:08 -0500 | [diff] [blame] | 1030 | if (!refresh || ce_uptodate(ce)) |
Junio C Hamano | eadb583 | 2008-01-18 23:45:24 -0800 | [diff] [blame] | 1031 | return ce; |
| 1032 | |
Marius Storm-Olsen | aa9349d | 2008-05-30 14:38:35 +0200 | [diff] [blame] | 1033 | /* |
Nguyễn Thái Ngọc Duy | 56cac48 | 2009-12-14 18:43:58 +0700 | [diff] [blame] | 1034 | * CE_VALID or CE_SKIP_WORKTREE means the user promised us |
| 1035 | * that the change to the work tree does not matter and told |
| 1036 | * us not to worry. |
Marius Storm-Olsen | aa9349d | 2008-05-30 14:38:35 +0200 | [diff] [blame] | 1037 | */ |
Nguyễn Thái Ngọc Duy | 56cac48 | 2009-12-14 18:43:58 +0700 | [diff] [blame] | 1038 | if (!ignore_skip_worktree && ce_skip_worktree(ce)) { |
| 1039 | ce_mark_uptodate(ce); |
| 1040 | return ce; |
| 1041 | } |
Marius Storm-Olsen | aa9349d | 2008-05-30 14:38:35 +0200 | [diff] [blame] | 1042 | if (!ignore_valid && (ce->ce_flags & CE_VALID)) { |
| 1043 | ce_mark_uptodate(ce); |
| 1044 | return ce; |
| 1045 | } |
| 1046 | |
Johannes Schindelin | 8fd2cb4 | 2006-07-25 21:32:18 -0700 | [diff] [blame] | 1047 | if (lstat(ce->name, &st) < 0) { |
Brad King | 2e2e7ec | 2014-01-27 09:45:07 -0500 | [diff] [blame] | 1048 | if (ignore_missing && errno == ENOENT) |
| 1049 | return ce; |
Junio C Hamano | ec0cc70 | 2007-04-01 21:34:34 -0700 | [diff] [blame] | 1050 | if (err) |
| 1051 | *err = errno; |
Johannes Schindelin | 8fd2cb4 | 2006-07-25 21:32:18 -0700 | [diff] [blame] | 1052 | return NULL; |
| 1053 | } |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1054 | |
Junio C Hamano | 4bd5b7d | 2007-11-10 00:15:03 -0800 | [diff] [blame] | 1055 | changed = ie_match_stat(istate, ce, &st, options); |
Jeff King | d05e697 | 2011-11-18 06:11:08 -0500 | [diff] [blame] | 1056 | if (changed_ret) |
| 1057 | *changed_ret = changed; |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1058 | if (!changed) { |
Junio C Hamano | 4bd5b7d | 2007-11-10 00:15:03 -0800 | [diff] [blame] | 1059 | /* |
| 1060 | * The path is unchanged. If we were told to ignore |
| 1061 | * valid bit, then we did the actual stat check and |
| 1062 | * found that the entry is unmodified. If the entry |
| 1063 | * is not marked VALID, this is the place to mark it |
| 1064 | * valid again, under "assume unchanged" mode. |
| 1065 | */ |
| 1066 | if (ignore_valid && assume_unchanged && |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1067 | !(ce->ce_flags & CE_VALID)) |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1068 | ; /* mark this one VALID again */ |
Junio C Hamano | eadb583 | 2008-01-18 23:45:24 -0800 | [diff] [blame] | 1069 | else { |
| 1070 | /* |
| 1071 | * We do not mark the index itself "modified" |
| 1072 | * because CE_UPTODATE flag is in-core only; |
| 1073 | * we are not going to write this change out. |
| 1074 | */ |
Junio C Hamano | 125fd98 | 2010-01-24 00:10:20 -0800 | [diff] [blame] | 1075 | if (!S_ISGITLINK(ce->ce_mode)) |
| 1076 | ce_mark_uptodate(ce); |
Johannes Schindelin | 8fd2cb4 | 2006-07-25 21:32:18 -0700 | [diff] [blame] | 1077 | return ce; |
Junio C Hamano | eadb583 | 2008-01-18 23:45:24 -0800 | [diff] [blame] | 1078 | } |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1079 | } |
| 1080 | |
Junio C Hamano | 4bd5b7d | 2007-11-10 00:15:03 -0800 | [diff] [blame] | 1081 | if (ie_modified(istate, ce, &st, options)) { |
Junio C Hamano | ec0cc70 | 2007-04-01 21:34:34 -0700 | [diff] [blame] | 1082 | if (err) |
| 1083 | *err = EINVAL; |
Johannes Schindelin | 8fd2cb4 | 2006-07-25 21:32:18 -0700 | [diff] [blame] | 1084 | return NULL; |
| 1085 | } |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1086 | |
| 1087 | size = ce_size(ce); |
| 1088 | updated = xmalloc(size); |
| 1089 | memcpy(updated, ce, size); |
| 1090 | fill_stat_cache_info(updated, &st); |
Junio C Hamano | 4bd5b7d | 2007-11-10 00:15:03 -0800 | [diff] [blame] | 1091 | /* |
| 1092 | * If ignore_valid is not set, we should leave CE_VALID bit |
| 1093 | * alone. Otherwise, paths marked with --no-assume-unchanged |
| 1094 | * (i.e. things to be edited) will reacquire CE_VALID bit |
| 1095 | * automatically, which is not really what we want. |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1096 | */ |
Junio C Hamano | 4bd5b7d | 2007-11-10 00:15:03 -0800 | [diff] [blame] | 1097 | if (!ignore_valid && assume_unchanged && |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1098 | !(ce->ce_flags & CE_VALID)) |
| 1099 | updated->ce_flags &= ~CE_VALID; |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1100 | |
| 1101 | return updated; |
| 1102 | } |
| 1103 | |
Matthieu Moy | 3deffc5 | 2009-08-21 10:57:59 +0200 | [diff] [blame] | 1104 | 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] | 1105 | int * first, const char *header_msg) |
Matthieu Moy | 3deffc5 | 2009-08-21 10:57:59 +0200 | [diff] [blame] | 1106 | { |
| 1107 | if (in_porcelain && *first && header_msg) { |
| 1108 | printf("%s\n", header_msg); |
Junio C Hamano | cd2b8ae | 2011-08-25 14:46:52 -0700 | [diff] [blame] | 1109 | *first = 0; |
Matthieu Moy | 3deffc5 | 2009-08-21 10:57:59 +0200 | [diff] [blame] | 1110 | } |
| 1111 | printf(fmt, name); |
| 1112 | } |
| 1113 | |
Nguyễn Thái Ngọc Duy | 9b2d614 | 2013-07-14 15:35:54 +0700 | [diff] [blame] | 1114 | int refresh_index(struct index_state *istate, unsigned int flags, |
| 1115 | const struct pathspec *pathspec, |
Jonathan Nieder | 046613c | 2011-02-22 22:43:23 +0000 | [diff] [blame] | 1116 | char *seen, const char *header_msg) |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1117 | { |
| 1118 | int i; |
| 1119 | int has_errors = 0; |
| 1120 | int really = (flags & REFRESH_REALLY) != 0; |
| 1121 | int allow_unmerged = (flags & REFRESH_UNMERGED) != 0; |
| 1122 | int quiet = (flags & REFRESH_QUIET) != 0; |
| 1123 | int not_new = (flags & REFRESH_IGNORE_MISSING) != 0; |
Johannes Schindelin | 5fdeacb | 2008-05-14 18:03:45 +0100 | [diff] [blame] | 1124 | int ignore_submodules = (flags & REFRESH_IGNORE_SUBMODULES) != 0; |
Matthieu Moy | 3deffc5 | 2009-08-21 10:57:59 +0200 | [diff] [blame] | 1125 | int first = 1; |
| 1126 | int in_porcelain = (flags & REFRESH_IN_PORCELAIN); |
Brad King | 2576272 | 2014-01-27 09:45:08 -0500 | [diff] [blame] | 1127 | unsigned int options = (CE_MATCH_REFRESH | |
| 1128 | (really ? CE_MATCH_IGNORE_VALID : 0) | |
Brad King | 2e2e7ec | 2014-01-27 09:45:07 -0500 | [diff] [blame] | 1129 | (not_new ? CE_MATCH_IGNORE_MISSING : 0)); |
Jeff King | 4bd4e73 | 2011-11-18 06:11:28 -0500 | [diff] [blame] | 1130 | const char *modified_fmt; |
Jeff King | 73b7eae | 2011-11-18 06:13:08 -0500 | [diff] [blame] | 1131 | const char *deleted_fmt; |
| 1132 | const char *typechange_fmt; |
| 1133 | const char *added_fmt; |
Jeff King | 4bd4e73 | 2011-11-18 06:11:28 -0500 | [diff] [blame] | 1134 | const char *unmerged_fmt; |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1135 | |
Jeff King | 4bd4e73 | 2011-11-18 06:11:28 -0500 | [diff] [blame] | 1136 | modified_fmt = (in_porcelain ? "M\t%s\n" : "%s: needs update\n"); |
Jeff King | 73b7eae | 2011-11-18 06:13:08 -0500 | [diff] [blame] | 1137 | deleted_fmt = (in_porcelain ? "D\t%s\n" : "%s: needs update\n"); |
| 1138 | typechange_fmt = (in_porcelain ? "T\t%s\n" : "%s needs update\n"); |
| 1139 | added_fmt = (in_porcelain ? "A\t%s\n" : "%s needs update\n"); |
Jeff King | 4bd4e73 | 2011-11-18 06:11:28 -0500 | [diff] [blame] | 1140 | 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] | 1141 | for (i = 0; i < istate->cache_nr; i++) { |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1142 | struct cache_entry *ce, *new; |
Junio C Hamano | ec0cc70 | 2007-04-01 21:34:34 -0700 | [diff] [blame] | 1143 | int cache_errno = 0; |
Jeff King | 73b7eae | 2011-11-18 06:13:08 -0500 | [diff] [blame] | 1144 | int changed = 0; |
Junio C Hamano | 3d1f148 | 2012-02-17 10:11:05 -0800 | [diff] [blame] | 1145 | int filtered = 0; |
Junio C Hamano | ec0cc70 | 2007-04-01 21:34:34 -0700 | [diff] [blame] | 1146 | |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1147 | ce = istate->cache[i]; |
Johannes Schindelin | 5fdeacb | 2008-05-14 18:03:45 +0100 | [diff] [blame] | 1148 | if (ignore_submodules && S_ISGITLINK(ce->ce_mode)) |
| 1149 | continue; |
| 1150 | |
Nguyễn Thái Ngọc Duy | 429bb40 | 2014-01-24 20:40:28 +0700 | [diff] [blame] | 1151 | if (pathspec && !ce_path_match(ce, pathspec, seen)) |
Junio C Hamano | 3d1f148 | 2012-02-17 10:11:05 -0800 | [diff] [blame] | 1152 | filtered = 1; |
| 1153 | |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1154 | if (ce_stage(ce)) { |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1155 | while ((i < istate->cache_nr) && |
| 1156 | ! strcmp(istate->cache[i]->name, ce->name)) |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1157 | i++; |
| 1158 | i--; |
| 1159 | if (allow_unmerged) |
| 1160 | continue; |
Junio C Hamano | 3d1f148 | 2012-02-17 10:11:05 -0800 | [diff] [blame] | 1161 | if (!filtered) |
| 1162 | show_file(unmerged_fmt, ce->name, in_porcelain, |
| 1163 | &first, header_msg); |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1164 | has_errors = 1; |
| 1165 | continue; |
| 1166 | } |
| 1167 | |
Junio C Hamano | 3d1f148 | 2012-02-17 10:11:05 -0800 | [diff] [blame] | 1168 | if (filtered) |
Alexandre Julliard | d616813 | 2007-08-11 23:59:01 +0200 | [diff] [blame] | 1169 | continue; |
| 1170 | |
Jeff King | 73b7eae | 2011-11-18 06:13:08 -0500 | [diff] [blame] | 1171 | new = refresh_cache_ent(istate, ce, options, &cache_errno, &changed); |
Johannes Schindelin | 8fd2cb4 | 2006-07-25 21:32:18 -0700 | [diff] [blame] | 1172 | if (new == ce) |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1173 | continue; |
Johannes Schindelin | 8fd2cb4 | 2006-07-25 21:32:18 -0700 | [diff] [blame] | 1174 | if (!new) { |
Jeff King | 73b7eae | 2011-11-18 06:13:08 -0500 | [diff] [blame] | 1175 | const char *fmt; |
| 1176 | |
Johannes Schindelin | 8fd2cb4 | 2006-07-25 21:32:18 -0700 | [diff] [blame] | 1177 | if (really && cache_errno == EINVAL) { |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1178 | /* If we are doing --really-refresh that |
| 1179 | * means the index is not valid anymore. |
| 1180 | */ |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1181 | ce->ce_flags &= ~CE_VALID; |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1182 | istate->cache_changed = 1; |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1183 | } |
| 1184 | if (quiet) |
| 1185 | continue; |
Jeff King | 73b7eae | 2011-11-18 06:13:08 -0500 | [diff] [blame] | 1186 | |
| 1187 | if (cache_errno == ENOENT) |
| 1188 | fmt = deleted_fmt; |
| 1189 | else if (ce->ce_flags & CE_INTENT_TO_ADD) |
| 1190 | fmt = added_fmt; /* must be before other checks */ |
| 1191 | else if (changed & TYPE_CHANGED) |
| 1192 | fmt = typechange_fmt; |
| 1193 | else |
| 1194 | fmt = modified_fmt; |
| 1195 | show_file(fmt, |
| 1196 | ce->name, in_porcelain, &first, header_msg); |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1197 | has_errors = 1; |
| 1198 | continue; |
| 1199 | } |
Linus Torvalds | cf55870 | 2008-01-22 18:41:14 -0800 | [diff] [blame] | 1200 | |
| 1201 | replace_index_entry(istate, i, new); |
Linus Torvalds | 405e5b2 | 2006-05-19 09:56:35 -0700 | [diff] [blame] | 1202 | } |
| 1203 | return has_errors; |
| 1204 | } |
| 1205 | |
Brad King | 2576272 | 2014-01-27 09:45:08 -0500 | [diff] [blame] | 1206 | static struct cache_entry *refresh_cache_entry(struct cache_entry *ce, |
| 1207 | unsigned int options) |
Junio C Hamano | ec0cc70 | 2007-04-01 21:34:34 -0700 | [diff] [blame] | 1208 | { |
Brad King | 2576272 | 2014-01-27 09:45:08 -0500 | [diff] [blame] | 1209 | return refresh_cache_ent(&the_index, ce, options, NULL, NULL); |
Junio C Hamano | ec0cc70 | 2007-04-01 21:34:34 -0700 | [diff] [blame] | 1210 | } |
| 1211 | |
Junio C Hamano | db3b313 | 2012-04-03 15:53:09 -0700 | [diff] [blame] | 1212 | |
| 1213 | /***************************************************************** |
| 1214 | * Index File I/O |
| 1215 | *****************************************************************/ |
| 1216 | |
Junio C Hamano | 9d22778 | 2012-04-04 09:12:43 -0700 | [diff] [blame] | 1217 | #define INDEX_FORMAT_DEFAULT 3 |
| 1218 | |
Thomas Gummerer | 3c09d68 | 2014-02-23 21:49:59 +0100 | [diff] [blame] | 1219 | static int index_format_config(const char *var, const char *value, void *cb) |
| 1220 | { |
| 1221 | unsigned int *version = cb; |
| 1222 | if (!strcmp(var, "index.version")) { |
| 1223 | *version = git_config_int(var, value); |
| 1224 | return 0; |
| 1225 | } |
| 1226 | return 1; |
| 1227 | } |
| 1228 | |
Thomas Gummerer | 136347d | 2014-02-23 21:49:57 +0100 | [diff] [blame] | 1229 | static unsigned int get_index_format_default(void) |
| 1230 | { |
| 1231 | char *envversion = getenv("GIT_INDEX_VERSION"); |
Thomas Gummerer | 3c09d68 | 2014-02-23 21:49:59 +0100 | [diff] [blame] | 1232 | char *endp; |
| 1233 | unsigned int version = INDEX_FORMAT_DEFAULT; |
Thomas Gummerer | 136347d | 2014-02-23 21:49:57 +0100 | [diff] [blame] | 1234 | |
Thomas Gummerer | 3c09d68 | 2014-02-23 21:49:59 +0100 | [diff] [blame] | 1235 | if (!envversion) { |
| 1236 | git_config(index_format_config, &version); |
| 1237 | if (version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) { |
| 1238 | warning(_("index.version set, but the value is invalid.\n" |
Thomas Gummerer | 136347d | 2014-02-23 21:49:57 +0100 | [diff] [blame] | 1239 | "Using version %i"), INDEX_FORMAT_DEFAULT); |
Thomas Gummerer | 3c09d68 | 2014-02-23 21:49:59 +0100 | [diff] [blame] | 1240 | return INDEX_FORMAT_DEFAULT; |
Thomas Gummerer | 136347d | 2014-02-23 21:49:57 +0100 | [diff] [blame] | 1241 | } |
| 1242 | return version; |
| 1243 | } |
Thomas Gummerer | 3c09d68 | 2014-02-23 21:49:59 +0100 | [diff] [blame] | 1244 | |
| 1245 | version = strtoul(envversion, &endp, 10); |
| 1246 | if (*endp || |
| 1247 | version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) { |
| 1248 | warning(_("GIT_INDEX_VERSION set, but the value is invalid.\n" |
| 1249 | "Using version %i"), INDEX_FORMAT_DEFAULT); |
| 1250 | version = INDEX_FORMAT_DEFAULT; |
| 1251 | } |
| 1252 | return version; |
Thomas Gummerer | 136347d | 2014-02-23 21:49:57 +0100 | [diff] [blame] | 1253 | } |
| 1254 | |
Junio C Hamano | db3b313 | 2012-04-03 15:53:09 -0700 | [diff] [blame] | 1255 | /* |
| 1256 | * dev/ino/uid/gid/size are also just tracked to the low 32 bits |
| 1257 | * Again - this is just a (very strong in practice) heuristic that |
| 1258 | * the inode hasn't changed. |
| 1259 | * |
| 1260 | * We save the fields in big-endian order to allow using the |
| 1261 | * index file over NFS transparently. |
| 1262 | */ |
| 1263 | struct ondisk_cache_entry { |
| 1264 | struct cache_time ctime; |
| 1265 | struct cache_time mtime; |
Thomas Gummerer | 7800c1e | 2013-08-18 21:41:51 +0200 | [diff] [blame] | 1266 | uint32_t dev; |
| 1267 | uint32_t ino; |
| 1268 | uint32_t mode; |
| 1269 | uint32_t uid; |
| 1270 | uint32_t gid; |
| 1271 | uint32_t size; |
Junio C Hamano | db3b313 | 2012-04-03 15:53:09 -0700 | [diff] [blame] | 1272 | unsigned char sha1[20]; |
Thomas Gummerer | 7800c1e | 2013-08-18 21:41:51 +0200 | [diff] [blame] | 1273 | uint16_t flags; |
Junio C Hamano | db3b313 | 2012-04-03 15:53:09 -0700 | [diff] [blame] | 1274 | char name[FLEX_ARRAY]; /* more */ |
| 1275 | }; |
| 1276 | |
| 1277 | /* |
| 1278 | * This struct is used when CE_EXTENDED bit is 1 |
| 1279 | * The struct must match ondisk_cache_entry exactly from |
| 1280 | * ctime till flags |
| 1281 | */ |
| 1282 | struct ondisk_cache_entry_extended { |
| 1283 | struct cache_time ctime; |
| 1284 | struct cache_time mtime; |
Thomas Gummerer | 7800c1e | 2013-08-18 21:41:51 +0200 | [diff] [blame] | 1285 | uint32_t dev; |
| 1286 | uint32_t ino; |
| 1287 | uint32_t mode; |
| 1288 | uint32_t uid; |
| 1289 | uint32_t gid; |
| 1290 | uint32_t size; |
Junio C Hamano | db3b313 | 2012-04-03 15:53:09 -0700 | [diff] [blame] | 1291 | unsigned char sha1[20]; |
Thomas Gummerer | 7800c1e | 2013-08-18 21:41:51 +0200 | [diff] [blame] | 1292 | uint16_t flags; |
| 1293 | uint16_t flags2; |
Junio C Hamano | db3b313 | 2012-04-03 15:53:09 -0700 | [diff] [blame] | 1294 | char name[FLEX_ARRAY]; /* more */ |
| 1295 | }; |
| 1296 | |
Junio C Hamano | 6c9cd16 | 2012-04-03 15:53:15 -0700 | [diff] [blame] | 1297 | /* These are only used for v3 or lower */ |
Junio C Hamano | db3b313 | 2012-04-03 15:53:09 -0700 | [diff] [blame] | 1298 | #define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,name) + (len) + 8) & ~7) |
| 1299 | #define ondisk_cache_entry_size(len) align_flex_name(ondisk_cache_entry,len) |
| 1300 | #define ondisk_cache_entry_extended_size(len) align_flex_name(ondisk_cache_entry_extended,len) |
| 1301 | #define ondisk_ce_size(ce) (((ce)->ce_flags & CE_EXTENDED) ? \ |
| 1302 | ondisk_cache_entry_extended_size(ce_namelen(ce)) : \ |
| 1303 | ondisk_cache_entry_size(ce_namelen(ce))) |
| 1304 | |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 1305 | static int verify_hdr(struct cache_header *hdr, unsigned long size) |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1306 | { |
Nicolas Pitre | 9126f00 | 2008-10-01 14:05:20 -0400 | [diff] [blame] | 1307 | git_SHA_CTX c; |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 1308 | unsigned char sha1[20]; |
Junio C Hamano | 0136bac | 2012-04-03 15:53:12 -0700 | [diff] [blame] | 1309 | int hdr_version; |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1310 | |
Linus Torvalds | ccc4feb | 2005-04-15 10:44:27 -0700 | [diff] [blame] | 1311 | if (hdr->hdr_signature != htonl(CACHE_SIGNATURE)) |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1312 | return error("bad signature"); |
Junio C Hamano | 0136bac | 2012-04-03 15:53:12 -0700 | [diff] [blame] | 1313 | hdr_version = ntohl(hdr->hdr_version); |
Nguyễn Thái Ngọc Duy | b82a7b5 | 2013-02-22 19:09:24 +0700 | [diff] [blame] | 1314 | if (hdr_version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < hdr_version) |
Junio C Hamano | 0136bac | 2012-04-03 15:53:12 -0700 | [diff] [blame] | 1315 | return error("bad index version %d", hdr_version); |
Nicolas Pitre | 9126f00 | 2008-10-01 14:05:20 -0400 | [diff] [blame] | 1316 | git_SHA1_Init(&c); |
| 1317 | git_SHA1_Update(&c, hdr, size - 20); |
| 1318 | git_SHA1_Final(sha1, &c); |
David Rientjes | a89fccd | 2006-08-17 11:54:57 -0700 | [diff] [blame] | 1319 | if (hashcmp(sha1, (unsigned char *)hdr + size - 20)) |
Linus Torvalds | ca9be05 | 2005-04-20 12:36:41 -0700 | [diff] [blame] | 1320 | return error("bad index file sha1 signature"); |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1321 | return 0; |
| 1322 | } |
| 1323 | |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1324 | static int read_index_extension(struct index_state *istate, |
| 1325 | const char *ext, void *data, unsigned long sz) |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 1326 | { |
| 1327 | switch (CACHE_EXT(ext)) { |
| 1328 | case CACHE_EXT_TREE: |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1329 | istate->cache_tree = cache_tree_read(data, sz); |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 1330 | break; |
Junio C Hamano | cfc5789 | 2009-12-25 00:30:51 -0800 | [diff] [blame] | 1331 | case CACHE_EXT_RESOLVE_UNDO: |
| 1332 | istate->resolve_undo = resolve_undo_read(data, sz); |
| 1333 | break; |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 1334 | default: |
| 1335 | if (*ext < 'A' || 'Z' < *ext) |
| 1336 | return error("index uses %.4s extension, which we do not understand", |
| 1337 | ext); |
| 1338 | fprintf(stderr, "ignoring %.4s extension\n", ext); |
| 1339 | break; |
| 1340 | } |
| 1341 | return 0; |
| 1342 | } |
| 1343 | |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1344 | int read_index(struct index_state *istate) |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1345 | { |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1346 | return read_index_from(istate, get_index_file()); |
Johannes Schindelin | 8fd2cb4 | 2006-07-25 21:32:18 -0700 | [diff] [blame] | 1347 | } |
| 1348 | |
Junio C Hamano | 3fc22b5 | 2012-04-03 15:53:13 -0700 | [diff] [blame] | 1349 | static struct cache_entry *cache_entry_from_ondisk(struct ondisk_cache_entry *ondisk, |
| 1350 | unsigned int flags, |
| 1351 | const char *name, |
| 1352 | size_t len) |
| 1353 | { |
| 1354 | struct cache_entry *ce = xmalloc(cache_entry_size(len)); |
| 1355 | |
Jeff King | c3d8da5 | 2014-01-23 16:26:42 -0500 | [diff] [blame] | 1356 | ce->ce_stat_data.sd_ctime.sec = get_be32(&ondisk->ctime.sec); |
| 1357 | ce->ce_stat_data.sd_mtime.sec = get_be32(&ondisk->mtime.sec); |
| 1358 | ce->ce_stat_data.sd_ctime.nsec = get_be32(&ondisk->ctime.nsec); |
| 1359 | ce->ce_stat_data.sd_mtime.nsec = get_be32(&ondisk->mtime.nsec); |
| 1360 | ce->ce_stat_data.sd_dev = get_be32(&ondisk->dev); |
| 1361 | ce->ce_stat_data.sd_ino = get_be32(&ondisk->ino); |
| 1362 | ce->ce_mode = get_be32(&ondisk->mode); |
| 1363 | ce->ce_stat_data.sd_uid = get_be32(&ondisk->uid); |
| 1364 | ce->ce_stat_data.sd_gid = get_be32(&ondisk->gid); |
| 1365 | ce->ce_stat_data.sd_size = get_be32(&ondisk->size); |
Thomas Gummerer | b60e188 | 2012-07-11 11:22:37 +0200 | [diff] [blame] | 1366 | ce->ce_flags = flags & ~CE_NAMEMASK; |
| 1367 | ce->ce_namelen = len; |
Junio C Hamano | 3fc22b5 | 2012-04-03 15:53:13 -0700 | [diff] [blame] | 1368 | hashcpy(ce->sha1, ondisk->sha1); |
| 1369 | memcpy(ce->name, name, len); |
| 1370 | ce->name[len] = '\0'; |
| 1371 | return ce; |
| 1372 | } |
| 1373 | |
Junio C Hamano | 6c9cd16 | 2012-04-03 15:53:15 -0700 | [diff] [blame] | 1374 | /* |
| 1375 | * Adjacent cache entries tend to share the leading paths, so it makes |
| 1376 | * sense to only store the differences in later entries. In the v4 |
| 1377 | * on-disk format of the index, each on-disk cache entry stores the |
| 1378 | * number of bytes to be stripped from the end of the previous name, |
| 1379 | * and the bytes to append to the result, to come up with its name. |
| 1380 | */ |
| 1381 | static unsigned long expand_name_field(struct strbuf *name, const char *cp_) |
| 1382 | { |
| 1383 | const unsigned char *ep, *cp = (const unsigned char *)cp_; |
| 1384 | size_t len = decode_varint(&cp); |
| 1385 | |
| 1386 | if (name->len < len) |
| 1387 | die("malformed name field in the index"); |
| 1388 | strbuf_remove(name, name->len - len, len); |
| 1389 | for (ep = cp; *ep; ep++) |
| 1390 | ; /* find the end */ |
| 1391 | strbuf_add(name, cp, ep - cp); |
| 1392 | return (const char *)ep + 1 - cp_; |
| 1393 | } |
| 1394 | |
Junio C Hamano | 936f53d | 2012-04-03 15:53:11 -0700 | [diff] [blame] | 1395 | 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] | 1396 | unsigned long *ent_size, |
| 1397 | struct strbuf *previous_name) |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1398 | { |
René Scharfe | debed2a | 2011-10-24 23:59:14 +0200 | [diff] [blame] | 1399 | struct cache_entry *ce; |
Junio C Hamano | 7fec10b | 2008-01-18 23:42:00 -0800 | [diff] [blame] | 1400 | size_t len; |
Nguyễn Thái Ngọc Duy | 06aaaa0 | 2008-10-01 11:04:01 +0700 | [diff] [blame] | 1401 | const char *name; |
René Scharfe | debed2a | 2011-10-24 23:59:14 +0200 | [diff] [blame] | 1402 | unsigned int flags; |
| 1403 | |
| 1404 | /* On-disk flags are just 16 bits */ |
Jeff King | c3d8da5 | 2014-01-23 16:26:42 -0500 | [diff] [blame] | 1405 | flags = get_be16(&ondisk->flags); |
René Scharfe | debed2a | 2011-10-24 23:59:14 +0200 | [diff] [blame] | 1406 | len = flags & CE_NAMEMASK; |
| 1407 | |
| 1408 | if (flags & CE_EXTENDED) { |
| 1409 | struct ondisk_cache_entry_extended *ondisk2; |
| 1410 | int extended_flags; |
| 1411 | ondisk2 = (struct ondisk_cache_entry_extended *)ondisk; |
Jeff King | c3d8da5 | 2014-01-23 16:26:42 -0500 | [diff] [blame] | 1412 | extended_flags = get_be16(&ondisk2->flags2) << 16; |
René Scharfe | debed2a | 2011-10-24 23:59:14 +0200 | [diff] [blame] | 1413 | /* We do not yet understand any bit out of CE_EXTENDED_FLAGS */ |
| 1414 | if (extended_flags & ~CE_EXTENDED_FLAGS) |
| 1415 | die("Unknown index entry format %08x", extended_flags); |
| 1416 | flags |= extended_flags; |
| 1417 | name = ondisk2->name; |
| 1418 | } |
| 1419 | else |
| 1420 | name = ondisk->name; |
| 1421 | |
Junio C Hamano | 6c9cd16 | 2012-04-03 15:53:15 -0700 | [diff] [blame] | 1422 | if (!previous_name) { |
| 1423 | /* v3 and earlier */ |
| 1424 | if (len == CE_NAMEMASK) |
| 1425 | len = strlen(name); |
| 1426 | ce = cache_entry_from_ondisk(ondisk, flags, name, len); |
René Scharfe | debed2a | 2011-10-24 23:59:14 +0200 | [diff] [blame] | 1427 | |
Junio C Hamano | 6c9cd16 | 2012-04-03 15:53:15 -0700 | [diff] [blame] | 1428 | *ent_size = ondisk_ce_size(ce); |
| 1429 | } else { |
| 1430 | unsigned long consumed; |
| 1431 | consumed = expand_name_field(previous_name, name); |
| 1432 | ce = cache_entry_from_ondisk(ondisk, flags, |
| 1433 | previous_name->buf, |
| 1434 | previous_name->len); |
Junio C Hamano | 7fec10b | 2008-01-18 23:42:00 -0800 | [diff] [blame] | 1435 | |
Junio C Hamano | 6c9cd16 | 2012-04-03 15:53:15 -0700 | [diff] [blame] | 1436 | *ent_size = (name - ((char *)ondisk)) + consumed; |
| 1437 | } |
René Scharfe | debed2a | 2011-10-24 23:59:14 +0200 | [diff] [blame] | 1438 | return ce; |
Linus Torvalds | cf55870 | 2008-01-22 18:41:14 -0800 | [diff] [blame] | 1439 | } |
| 1440 | |
Johannes Schindelin | 8fd2cb4 | 2006-07-25 21:32:18 -0700 | [diff] [blame] | 1441 | /* remember to discard_cache() before reading a different cache! */ |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1442 | int read_index_from(struct index_state *istate, const char *path) |
Johannes Schindelin | 8fd2cb4 | 2006-07-25 21:32:18 -0700 | [diff] [blame] | 1443 | { |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1444 | int fd, i; |
| 1445 | struct stat st; |
René Scharfe | debed2a | 2011-10-24 23:59:14 +0200 | [diff] [blame] | 1446 | unsigned long src_offset; |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1447 | struct cache_header *hdr; |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1448 | void *mmap; |
| 1449 | size_t mmap_size; |
Junio C Hamano | 6c9cd16 | 2012-04-03 15:53:15 -0700 | [diff] [blame] | 1450 | struct strbuf previous_name_buf = STRBUF_INIT, *previous_name; |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1451 | |
Junio C Hamano | 913e0e9 | 2008-08-23 12:57:30 -0700 | [diff] [blame] | 1452 | if (istate->initialized) |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1453 | return istate->cache_nr; |
Linus Torvalds | 5d1a5c0 | 2005-10-01 13:24:27 -0700 | [diff] [blame] | 1454 | |
Kjetil Barvik | fba2f38 | 2009-02-19 21:08:29 +0100 | [diff] [blame] | 1455 | istate->timestamp.sec = 0; |
| 1456 | istate->timestamp.nsec = 0; |
Johannes Schindelin | 8fd2cb4 | 2006-07-25 21:32:18 -0700 | [diff] [blame] | 1457 | fd = open(path, O_RDONLY); |
Linus Torvalds | 5d1a5c0 | 2005-10-01 13:24:27 -0700 | [diff] [blame] | 1458 | if (fd < 0) { |
| 1459 | if (errno == ENOENT) |
| 1460 | return 0; |
Thomas Rast | d824cbb | 2009-06-27 17:58:46 +0200 | [diff] [blame] | 1461 | die_errno("index file open failed"); |
Linus Torvalds | 5d1a5c0 | 2005-10-01 13:24:27 -0700 | [diff] [blame] | 1462 | } |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1463 | |
Luiz Fernando N. Capitulino | 3511a37 | 2007-04-25 11:18:17 -0300 | [diff] [blame] | 1464 | if (fstat(fd, &st)) |
Thomas Rast | d824cbb | 2009-06-27 17:58:46 +0200 | [diff] [blame] | 1465 | die_errno("cannot stat the open index"); |
Luiz Fernando N. Capitulino | 3511a37 | 2007-04-25 11:18:17 -0300 | [diff] [blame] | 1466 | |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1467 | mmap_size = xsize_t(st.st_size); |
| 1468 | if (mmap_size < sizeof(struct cache_header) + 20) |
Luiz Fernando N. Capitulino | 3511a37 | 2007-04-25 11:18:17 -0300 | [diff] [blame] | 1469 | die("index file smaller than expected"); |
| 1470 | |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1471 | mmap = xmmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1472 | if (mmap == MAP_FAILED) |
Thomas Rast | 0721c31 | 2009-06-27 17:58:47 +0200 | [diff] [blame] | 1473 | die_errno("unable to map index file"); |
Nguyễn Thái Ngọc Duy | 57d84f8 | 2012-08-06 18:27:09 +0700 | [diff] [blame] | 1474 | close(fd); |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1475 | |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1476 | hdr = mmap; |
| 1477 | if (verify_hdr(hdr, mmap_size) < 0) |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1478 | goto unmap; |
| 1479 | |
Junio C Hamano | 9d22778 | 2012-04-04 09:12:43 -0700 | [diff] [blame] | 1480 | istate->version = ntohl(hdr->hdr_version); |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1481 | istate->cache_nr = ntohl(hdr->hdr_entries); |
| 1482 | istate->cache_alloc = alloc_nr(istate->cache_nr); |
Felipe Contreras | c4aa316 | 2013-05-30 08:56:19 -0500 | [diff] [blame] | 1483 | istate->cache = xcalloc(istate->cache_alloc, sizeof(*istate->cache)); |
Junio C Hamano | 913e0e9 | 2008-08-23 12:57:30 -0700 | [diff] [blame] | 1484 | istate->initialized = 1; |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1485 | |
Junio C Hamano | 9d22778 | 2012-04-04 09:12:43 -0700 | [diff] [blame] | 1486 | if (istate->version == 4) |
Junio C Hamano | 6c9cd16 | 2012-04-03 15:53:15 -0700 | [diff] [blame] | 1487 | previous_name = &previous_name_buf; |
| 1488 | else |
| 1489 | previous_name = NULL; |
| 1490 | |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1491 | src_offset = sizeof(*hdr); |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1492 | for (i = 0; i < istate->cache_nr; i++) { |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1493 | struct ondisk_cache_entry *disk_ce; |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1494 | struct cache_entry *ce; |
Junio C Hamano | 936f53d | 2012-04-03 15:53:11 -0700 | [diff] [blame] | 1495 | unsigned long consumed; |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1496 | |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1497 | disk_ce = (struct ondisk_cache_entry *)((char *)mmap + src_offset); |
Junio C Hamano | 6c9cd16 | 2012-04-03 15:53:15 -0700 | [diff] [blame] | 1498 | ce = create_from_disk(disk_ce, &consumed, previous_name); |
Linus Torvalds | cf55870 | 2008-01-22 18:41:14 -0800 | [diff] [blame] | 1499 | set_index_entry(istate, i, ce); |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1500 | |
Junio C Hamano | 936f53d | 2012-04-03 15:53:11 -0700 | [diff] [blame] | 1501 | src_offset += consumed; |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1502 | } |
Junio C Hamano | 6c9cd16 | 2012-04-03 15:53:15 -0700 | [diff] [blame] | 1503 | strbuf_release(&previous_name_buf); |
Kjetil Barvik | fba2f38 | 2009-02-19 21:08:29 +0100 | [diff] [blame] | 1504 | istate->timestamp.sec = st.st_mtime; |
Kjetil Barvik | c06ff49 | 2009-03-04 18:47:40 +0100 | [diff] [blame] | 1505 | istate->timestamp.nsec = ST_MTIME_NSEC(st); |
Kjetil Barvik | fba2f38 | 2009-02-19 21:08:29 +0100 | [diff] [blame] | 1506 | |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1507 | while (src_offset <= mmap_size - 20 - 8) { |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 1508 | /* After an array of active_nr index entries, |
| 1509 | * there can be arbitrary number of extended |
| 1510 | * sections, each of which is prefixed with |
| 1511 | * extension name (4-byte) and section length |
| 1512 | * in 4-byte network byte order. |
| 1513 | */ |
Nathaniel W Filardo | 07cc8ec | 2009-12-27 01:11:21 -0500 | [diff] [blame] | 1514 | uint32_t extsize; |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1515 | memcpy(&extsize, (char *)mmap + src_offset + 4, 4); |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 1516 | extsize = ntohl(extsize); |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1517 | if (read_index_extension(istate, |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1518 | (const char *) mmap + src_offset, |
| 1519 | (char *) mmap + src_offset + 8, |
Florian Forster | 1d7f171 | 2006-06-18 17:18:09 +0200 | [diff] [blame] | 1520 | extsize) < 0) |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 1521 | goto unmap; |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1522 | src_offset += 8; |
| 1523 | src_offset += extsize; |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 1524 | } |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1525 | munmap(mmap, mmap_size); |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1526 | return istate->cache_nr; |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1527 | |
| 1528 | unmap: |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1529 | munmap(mmap, mmap_size); |
Linus Torvalds | 5d1a5c0 | 2005-10-01 13:24:27 -0700 | [diff] [blame] | 1530 | die("index file corrupt"); |
Linus Torvalds | e83c516 | 2005-04-07 15:13:13 -0700 | [diff] [blame] | 1531 | } |
| 1532 | |
Junio C Hamano | fa7b3c2 | 2008-11-12 11:52:35 -0800 | [diff] [blame] | 1533 | int is_index_unborn(struct index_state *istate) |
| 1534 | { |
René Scharfe | debed2a | 2011-10-24 23:59:14 +0200 | [diff] [blame] | 1535 | return (!istate->cache_nr && !istate->timestamp.sec); |
Junio C Hamano | fa7b3c2 | 2008-11-12 11:52:35 -0800 | [diff] [blame] | 1536 | } |
| 1537 | |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1538 | int discard_index(struct index_state *istate) |
Johannes Schindelin | 6d297f8 | 2006-07-08 18:42:41 +0200 | [diff] [blame] | 1539 | { |
René Scharfe | debed2a | 2011-10-24 23:59:14 +0200 | [diff] [blame] | 1540 | int i; |
| 1541 | |
| 1542 | for (i = 0; i < istate->cache_nr; i++) |
| 1543 | free(istate->cache[i]); |
Junio C Hamano | cfc5789 | 2009-12-25 00:30:51 -0800 | [diff] [blame] | 1544 | resolve_undo_clear_index(istate); |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1545 | istate->cache_nr = 0; |
| 1546 | istate->cache_changed = 0; |
Kjetil Barvik | fba2f38 | 2009-02-19 21:08:29 +0100 | [diff] [blame] | 1547 | istate->timestamp.sec = 0; |
| 1548 | istate->timestamp.nsec = 0; |
Karsten Blees | 2092678 | 2013-02-28 00:57:48 +0100 | [diff] [blame] | 1549 | free_name_hash(istate); |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1550 | cache_tree_free(&(istate->cache_tree)); |
Junio C Hamano | 913e0e9 | 2008-08-23 12:57:30 -0700 | [diff] [blame] | 1551 | istate->initialized = 0; |
René Scharfe | a0fc4db | 2013-06-09 19:39:18 +0200 | [diff] [blame] | 1552 | free(istate->cache); |
| 1553 | istate->cache = NULL; |
| 1554 | istate->cache_alloc = 0; |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1555 | return 0; |
Johannes Schindelin | 6d297f8 | 2006-07-08 18:42:41 +0200 | [diff] [blame] | 1556 | } |
| 1557 | |
Linus Torvalds | d1f128b | 2008-03-06 12:46:09 -0800 | [diff] [blame] | 1558 | int unmerged_index(const struct index_state *istate) |
Daniel Barkalow | 94a5728 | 2008-02-07 11:40:13 -0500 | [diff] [blame] | 1559 | { |
| 1560 | int i; |
| 1561 | for (i = 0; i < istate->cache_nr; i++) { |
| 1562 | if (ce_stage(istate->cache[i])) |
| 1563 | return 1; |
| 1564 | } |
| 1565 | return 0; |
| 1566 | } |
| 1567 | |
Linus Torvalds | 4990aad | 2005-04-20 12:16:57 -0700 | [diff] [blame] | 1568 | #define WRITE_BUFFER_SIZE 8192 |
Brian Gerst | bf0f910 | 2005-05-18 08:14:09 -0400 | [diff] [blame] | 1569 | static unsigned char write_buffer[WRITE_BUFFER_SIZE]; |
Linus Torvalds | 4990aad | 2005-04-20 12:16:57 -0700 | [diff] [blame] | 1570 | static unsigned long write_buffer_len; |
| 1571 | |
Nicolas Pitre | 9126f00 | 2008-10-01 14:05:20 -0400 | [diff] [blame] | 1572 | static int ce_write_flush(git_SHA_CTX *context, int fd) |
Junio C Hamano | 6015c28 | 2006-08-08 14:47:32 -0700 | [diff] [blame] | 1573 | { |
| 1574 | unsigned int buffered = write_buffer_len; |
| 1575 | if (buffered) { |
Nicolas Pitre | 9126f00 | 2008-10-01 14:05:20 -0400 | [diff] [blame] | 1576 | git_SHA1_Update(context, write_buffer, buffered); |
Andy Whitcroft | 93822c2 | 2007-01-08 15:58:23 +0000 | [diff] [blame] | 1577 | if (write_in_full(fd, write_buffer, buffered) != buffered) |
Junio C Hamano | 6015c28 | 2006-08-08 14:47:32 -0700 | [diff] [blame] | 1578 | return -1; |
| 1579 | write_buffer_len = 0; |
| 1580 | } |
| 1581 | return 0; |
| 1582 | } |
| 1583 | |
Nicolas Pitre | 9126f00 | 2008-10-01 14:05:20 -0400 | [diff] [blame] | 1584 | static int ce_write(git_SHA_CTX *context, int fd, void *data, unsigned int len) |
Linus Torvalds | 4990aad | 2005-04-20 12:16:57 -0700 | [diff] [blame] | 1585 | { |
| 1586 | while (len) { |
| 1587 | unsigned int buffered = write_buffer_len; |
| 1588 | unsigned int partial = WRITE_BUFFER_SIZE - buffered; |
| 1589 | if (partial > len) |
| 1590 | partial = len; |
| 1591 | memcpy(write_buffer + buffered, data, partial); |
| 1592 | buffered += partial; |
| 1593 | if (buffered == WRITE_BUFFER_SIZE) { |
Junio C Hamano | 6015c28 | 2006-08-08 14:47:32 -0700 | [diff] [blame] | 1594 | write_buffer_len = buffered; |
| 1595 | if (ce_write_flush(context, fd)) |
Linus Torvalds | 4990aad | 2005-04-20 12:16:57 -0700 | [diff] [blame] | 1596 | return -1; |
| 1597 | buffered = 0; |
| 1598 | } |
| 1599 | write_buffer_len = buffered; |
| 1600 | len -= partial; |
Florian Forster | 1d7f171 | 2006-06-18 17:18:09 +0200 | [diff] [blame] | 1601 | data = (char *) data + partial; |
Junio C Hamano | a6080a0 | 2007-06-07 00:04:01 -0700 | [diff] [blame] | 1602 | } |
| 1603 | return 0; |
Linus Torvalds | 4990aad | 2005-04-20 12:16:57 -0700 | [diff] [blame] | 1604 | } |
| 1605 | |
Nicolas Pitre | 9126f00 | 2008-10-01 14:05:20 -0400 | [diff] [blame] | 1606 | static int write_index_ext_header(git_SHA_CTX *context, int fd, |
Dennis Stosberg | ac58c7b | 2006-05-28 21:08:08 +0200 | [diff] [blame] | 1607 | unsigned int ext, unsigned int sz) |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 1608 | { |
| 1609 | ext = htonl(ext); |
| 1610 | sz = htonl(sz); |
David Rientjes | 968a1d6 | 2006-08-14 13:38:14 -0700 | [diff] [blame] | 1611 | return ((ce_write(context, fd, &ext, 4) < 0) || |
| 1612 | (ce_write(context, fd, &sz, 4) < 0)) ? -1 : 0; |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 1613 | } |
| 1614 | |
Nicolas Pitre | 9126f00 | 2008-10-01 14:05:20 -0400 | [diff] [blame] | 1615 | static int ce_flush(git_SHA_CTX *context, int fd) |
Linus Torvalds | 4990aad | 2005-04-20 12:16:57 -0700 | [diff] [blame] | 1616 | { |
| 1617 | unsigned int left = write_buffer_len; |
Linus Torvalds | ca9be05 | 2005-04-20 12:36:41 -0700 | [diff] [blame] | 1618 | |
Linus Torvalds | 4990aad | 2005-04-20 12:16:57 -0700 | [diff] [blame] | 1619 | if (left) { |
| 1620 | write_buffer_len = 0; |
Nicolas Pitre | 9126f00 | 2008-10-01 14:05:20 -0400 | [diff] [blame] | 1621 | git_SHA1_Update(context, write_buffer, left); |
Linus Torvalds | 4990aad | 2005-04-20 12:16:57 -0700 | [diff] [blame] | 1622 | } |
Linus Torvalds | ca9be05 | 2005-04-20 12:36:41 -0700 | [diff] [blame] | 1623 | |
Qingning Huo | 2c865d9 | 2005-09-11 14:27:47 +0100 | [diff] [blame] | 1624 | /* Flush first if not enough space for SHA1 signature */ |
| 1625 | if (left + 20 > WRITE_BUFFER_SIZE) { |
Andy Whitcroft | 93822c2 | 2007-01-08 15:58:23 +0000 | [diff] [blame] | 1626 | if (write_in_full(fd, write_buffer, left) != left) |
Qingning Huo | 2c865d9 | 2005-09-11 14:27:47 +0100 | [diff] [blame] | 1627 | return -1; |
| 1628 | left = 0; |
| 1629 | } |
| 1630 | |
Linus Torvalds | ca9be05 | 2005-04-20 12:36:41 -0700 | [diff] [blame] | 1631 | /* Append the SHA1 signature at the end */ |
Nicolas Pitre | 9126f00 | 2008-10-01 14:05:20 -0400 | [diff] [blame] | 1632 | git_SHA1_Final(write_buffer + left, context); |
Linus Torvalds | ca9be05 | 2005-04-20 12:36:41 -0700 | [diff] [blame] | 1633 | left += 20; |
Andy Whitcroft | 93822c2 | 2007-01-08 15:58:23 +0000 | [diff] [blame] | 1634 | return (write_in_full(fd, write_buffer, left) != left) ? -1 : 0; |
Linus Torvalds | 4990aad | 2005-04-20 12:16:57 -0700 | [diff] [blame] | 1635 | } |
| 1636 | |
Junio C Hamano | 407c8eb | 2005-12-20 12:12:18 -0800 | [diff] [blame] | 1637 | static void ce_smudge_racily_clean_entry(struct cache_entry *ce) |
| 1638 | { |
| 1639 | /* |
| 1640 | * The only thing we care about in this function is to smudge the |
| 1641 | * falsely clean entry due to touch-update-touch race, so we leave |
| 1642 | * everything else as they are. We are called for entries whose |
Michael Haggerty | c21d39d | 2013-06-20 10:37:50 +0200 | [diff] [blame] | 1643 | * ce_stat_data.sd_mtime match the index file mtime. |
Junio C Hamano | c70115b | 2008-07-29 01:13:44 -0700 | [diff] [blame] | 1644 | * |
| 1645 | * Note that this actually does not do much for gitlinks, for |
| 1646 | * which ce_match_stat_basic() always goes to the actual |
| 1647 | * contents. The caller checks with is_racy_timestamp() which |
| 1648 | * 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] | 1649 | */ |
| 1650 | struct stat st; |
| 1651 | |
| 1652 | if (lstat(ce->name, &st) < 0) |
| 1653 | return; |
| 1654 | if (ce_match_stat_basic(ce, &st)) |
| 1655 | return; |
| 1656 | if (ce_modified_check_fs(ce, &st)) { |
Junio C Hamano | 4b3511b | 2005-12-20 14:18:47 -0800 | [diff] [blame] | 1657 | /* This is "racily clean"; smudge it. Note that this |
| 1658 | * is a tricky code. At first glance, it may appear |
| 1659 | * that it can break with this sequence: |
| 1660 | * |
| 1661 | * $ echo xyzzy >frotz |
| 1662 | * $ git-update-index --add frotz |
| 1663 | * $ : >frotz |
| 1664 | * $ sleep 3 |
| 1665 | * $ echo filfre >nitfol |
| 1666 | * $ git-update-index --add nitfol |
| 1667 | * |
Junio C Hamano | b7e58b1 | 2006-08-05 04:16:02 -0700 | [diff] [blame] | 1668 | * but it does not. When the second update-index runs, |
Junio C Hamano | 4b3511b | 2005-12-20 14:18:47 -0800 | [diff] [blame] | 1669 | * it notices that the entry "frotz" has the same timestamp |
| 1670 | * as index, and if we were to smudge it by resetting its |
| 1671 | * size to zero here, then the object name recorded |
| 1672 | * in index is the 6-byte file but the cached stat information |
| 1673 | * becomes zero --- which would then match what we would |
Junio C Hamano | a6080a0 | 2007-06-07 00:04:01 -0700 | [diff] [blame] | 1674 | * obtain from the filesystem next time we stat("frotz"). |
Junio C Hamano | 4b3511b | 2005-12-20 14:18:47 -0800 | [diff] [blame] | 1675 | * |
| 1676 | * However, the second update-index, before calling |
| 1677 | * this function, notices that the cached size is 6 |
| 1678 | * bytes and what is on the filesystem is an empty |
| 1679 | * file, and never calls us, so the cached size information |
| 1680 | * for "frotz" stays 6 which does not match the filesystem. |
| 1681 | */ |
Michael Haggerty | c21d39d | 2013-06-20 10:37:50 +0200 | [diff] [blame] | 1682 | ce->ce_stat_data.sd_size = 0; |
Junio C Hamano | 407c8eb | 2005-12-20 12:12:18 -0800 | [diff] [blame] | 1683 | } |
| 1684 | } |
| 1685 | |
Junio C Hamano | f136f7b | 2012-04-03 15:53:14 -0700 | [diff] [blame] | 1686 | /* Copy miscellaneous fields but not the name */ |
| 1687 | static char *copy_cache_entry_to_ondisk(struct ondisk_cache_entry *ondisk, |
| 1688 | struct cache_entry *ce) |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1689 | { |
Thomas Gummerer | b60e188 | 2012-07-11 11:22:37 +0200 | [diff] [blame] | 1690 | short flags; |
| 1691 | |
Michael Haggerty | c21d39d | 2013-06-20 10:37:50 +0200 | [diff] [blame] | 1692 | ondisk->ctime.sec = htonl(ce->ce_stat_data.sd_ctime.sec); |
| 1693 | ondisk->mtime.sec = htonl(ce->ce_stat_data.sd_mtime.sec); |
| 1694 | ondisk->ctime.nsec = htonl(ce->ce_stat_data.sd_ctime.nsec); |
| 1695 | ondisk->mtime.nsec = htonl(ce->ce_stat_data.sd_mtime.nsec); |
| 1696 | ondisk->dev = htonl(ce->ce_stat_data.sd_dev); |
| 1697 | ondisk->ino = htonl(ce->ce_stat_data.sd_ino); |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1698 | ondisk->mode = htonl(ce->ce_mode); |
Michael Haggerty | c21d39d | 2013-06-20 10:37:50 +0200 | [diff] [blame] | 1699 | ondisk->uid = htonl(ce->ce_stat_data.sd_uid); |
| 1700 | ondisk->gid = htonl(ce->ce_stat_data.sd_gid); |
| 1701 | ondisk->size = htonl(ce->ce_stat_data.sd_size); |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1702 | hashcpy(ondisk->sha1, ce->sha1); |
Thomas Gummerer | b60e188 | 2012-07-11 11:22:37 +0200 | [diff] [blame] | 1703 | |
| 1704 | flags = ce->ce_flags; |
| 1705 | flags |= (ce_namelen(ce) >= CE_NAMEMASK ? CE_NAMEMASK : ce_namelen(ce)); |
| 1706 | ondisk->flags = htons(flags); |
Nguyễn Thái Ngọc Duy | 06aaaa0 | 2008-10-01 11:04:01 +0700 | [diff] [blame] | 1707 | if (ce->ce_flags & CE_EXTENDED) { |
| 1708 | struct ondisk_cache_entry_extended *ondisk2; |
| 1709 | ondisk2 = (struct ondisk_cache_entry_extended *)ondisk; |
| 1710 | ondisk2->flags2 = htons((ce->ce_flags & CE_EXTENDED_FLAGS) >> 16); |
Junio C Hamano | f136f7b | 2012-04-03 15:53:14 -0700 | [diff] [blame] | 1711 | return ondisk2->name; |
Nguyễn Thái Ngọc Duy | 06aaaa0 | 2008-10-01 11:04:01 +0700 | [diff] [blame] | 1712 | } |
Junio C Hamano | f136f7b | 2012-04-03 15:53:14 -0700 | [diff] [blame] | 1713 | else { |
| 1714 | return ondisk->name; |
| 1715 | } |
| 1716 | } |
| 1717 | |
Junio C Hamano | 9d22778 | 2012-04-04 09:12:43 -0700 | [diff] [blame] | 1718 | static int ce_write_entry(git_SHA_CTX *c, int fd, struct cache_entry *ce, |
| 1719 | struct strbuf *previous_name) |
Junio C Hamano | f136f7b | 2012-04-03 15:53:14 -0700 | [diff] [blame] | 1720 | { |
Junio C Hamano | 9d22778 | 2012-04-04 09:12:43 -0700 | [diff] [blame] | 1721 | int size; |
| 1722 | struct ondisk_cache_entry *ondisk; |
Junio C Hamano | f136f7b | 2012-04-03 15:53:14 -0700 | [diff] [blame] | 1723 | char *name; |
| 1724 | int result; |
| 1725 | |
Junio C Hamano | 9d22778 | 2012-04-04 09:12:43 -0700 | [diff] [blame] | 1726 | if (!previous_name) { |
| 1727 | size = ondisk_ce_size(ce); |
| 1728 | ondisk = xcalloc(1, size); |
| 1729 | name = copy_cache_entry_to_ondisk(ondisk, ce); |
| 1730 | memcpy(name, ce->name, ce_namelen(ce)); |
| 1731 | } else { |
| 1732 | int common, to_remove, prefix_size; |
| 1733 | unsigned char to_remove_vi[16]; |
| 1734 | for (common = 0; |
| 1735 | (ce->name[common] && |
| 1736 | common < previous_name->len && |
| 1737 | ce->name[common] == previous_name->buf[common]); |
| 1738 | common++) |
| 1739 | ; /* still matching */ |
| 1740 | to_remove = previous_name->len - common; |
| 1741 | prefix_size = encode_varint(to_remove, to_remove_vi); |
| 1742 | |
| 1743 | if (ce->ce_flags & CE_EXTENDED) |
| 1744 | size = offsetof(struct ondisk_cache_entry_extended, name); |
| 1745 | else |
| 1746 | size = offsetof(struct ondisk_cache_entry, name); |
| 1747 | size += prefix_size + (ce_namelen(ce) - common + 1); |
| 1748 | |
| 1749 | ondisk = xcalloc(1, size); |
| 1750 | name = copy_cache_entry_to_ondisk(ondisk, ce); |
| 1751 | memcpy(name, to_remove_vi, prefix_size); |
| 1752 | memcpy(name + prefix_size, ce->name + common, ce_namelen(ce) - common); |
| 1753 | |
| 1754 | strbuf_splice(previous_name, common, to_remove, |
| 1755 | ce->name + common, ce_namelen(ce) - common); |
| 1756 | } |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1757 | |
Jonathan Nieder | 59efba6 | 2010-08-09 22:28:07 -0500 | [diff] [blame] | 1758 | result = ce_write(c, fd, ondisk, size); |
| 1759 | free(ondisk); |
| 1760 | return result; |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1761 | } |
| 1762 | |
Junio C Hamano | 483fbe2 | 2011-03-21 10:18:19 -0700 | [diff] [blame] | 1763 | static int has_racy_timestamp(struct index_state *istate) |
| 1764 | { |
| 1765 | int entries = istate->cache_nr; |
| 1766 | int i; |
| 1767 | |
| 1768 | for (i = 0; i < entries; i++) { |
| 1769 | struct cache_entry *ce = istate->cache[i]; |
| 1770 | if (is_racy_timestamp(istate, ce)) |
| 1771 | return 1; |
| 1772 | } |
| 1773 | return 0; |
| 1774 | } |
| 1775 | |
Junio C Hamano | ccdc4ec | 2011-03-21 10:16:10 -0700 | [diff] [blame] | 1776 | /* |
Ondřej Bílka | 98e023d | 2013-07-29 10:18:21 +0200 | [diff] [blame] | 1777 | * Opportunistically update the index but do not complain if we can't |
Junio C Hamano | ccdc4ec | 2011-03-21 10:16:10 -0700 | [diff] [blame] | 1778 | */ |
| 1779 | void update_index_if_able(struct index_state *istate, struct lock_file *lockfile) |
| 1780 | { |
Junio C Hamano | 483fbe2 | 2011-03-21 10:18:19 -0700 | [diff] [blame] | 1781 | if ((istate->cache_changed || has_racy_timestamp(istate)) && |
Junio C Hamano | ccdc4ec | 2011-03-21 10:16:10 -0700 | [diff] [blame] | 1782 | !write_index(istate, lockfile->fd)) |
| 1783 | commit_locked_index(lockfile); |
| 1784 | else |
| 1785 | rollback_lock_file(lockfile); |
| 1786 | } |
| 1787 | |
Kjetil Barvik | e1afca4 | 2009-02-23 19:02:57 +0100 | [diff] [blame] | 1788 | int write_index(struct index_state *istate, int newfd) |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 1789 | { |
Nicolas Pitre | 9126f00 | 2008-10-01 14:05:20 -0400 | [diff] [blame] | 1790 | git_SHA_CTX c; |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 1791 | struct cache_header hdr; |
Junio C Hamano | 9d22778 | 2012-04-04 09:12:43 -0700 | [diff] [blame] | 1792 | int i, err, removed, extended, hdr_version; |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1793 | struct cache_entry **cache = istate->cache; |
| 1794 | int entries = istate->cache_nr; |
Kjetil Barvik | e1afca4 | 2009-02-23 19:02:57 +0100 | [diff] [blame] | 1795 | struct stat st; |
Junio C Hamano | 9d22778 | 2012-04-04 09:12:43 -0700 | [diff] [blame] | 1796 | struct strbuf previous_name_buf = STRBUF_INIT, *previous_name; |
Junio C Hamano | 025a070 | 2005-06-10 01:32:37 -0700 | [diff] [blame] | 1797 | |
Nguyễn Thái Ngọc Duy | 06aaaa0 | 2008-10-01 11:04:01 +0700 | [diff] [blame] | 1798 | for (i = removed = extended = 0; i < entries; i++) { |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1799 | if (cache[i]->ce_flags & CE_REMOVE) |
Junio C Hamano | 025a070 | 2005-06-10 01:32:37 -0700 | [diff] [blame] | 1800 | removed++; |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 1801 | |
Nguyễn Thái Ngọc Duy | 06aaaa0 | 2008-10-01 11:04:01 +0700 | [diff] [blame] | 1802 | /* reduce extended entries if possible */ |
| 1803 | cache[i]->ce_flags &= ~CE_EXTENDED; |
| 1804 | if (cache[i]->ce_flags & CE_EXTENDED_FLAGS) { |
| 1805 | extended++; |
| 1806 | cache[i]->ce_flags |= CE_EXTENDED; |
| 1807 | } |
| 1808 | } |
| 1809 | |
Junio C Hamano | 9d22778 | 2012-04-04 09:12:43 -0700 | [diff] [blame] | 1810 | if (!istate->version) |
Thomas Gummerer | 136347d | 2014-02-23 21:49:57 +0100 | [diff] [blame] | 1811 | istate->version = get_index_format_default(); |
Junio C Hamano | 9d22778 | 2012-04-04 09:12:43 -0700 | [diff] [blame] | 1812 | |
| 1813 | /* demote version 3 to version 2 when the latter suffices */ |
| 1814 | if (istate->version == 3 || istate->version == 2) |
| 1815 | istate->version = extended ? 3 : 2; |
| 1816 | |
| 1817 | hdr_version = istate->version; |
| 1818 | |
Linus Torvalds | ccc4feb | 2005-04-15 10:44:27 -0700 | [diff] [blame] | 1819 | hdr.hdr_signature = htonl(CACHE_SIGNATURE); |
Junio C Hamano | 9d22778 | 2012-04-04 09:12:43 -0700 | [diff] [blame] | 1820 | hdr.hdr_version = htonl(hdr_version); |
Junio C Hamano | 025a070 | 2005-06-10 01:32:37 -0700 | [diff] [blame] | 1821 | hdr.hdr_entries = htonl(entries - removed); |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 1822 | |
Nicolas Pitre | 9126f00 | 2008-10-01 14:05:20 -0400 | [diff] [blame] | 1823 | git_SHA1_Init(&c); |
Linus Torvalds | ca9be05 | 2005-04-20 12:36:41 -0700 | [diff] [blame] | 1824 | if (ce_write(&c, newfd, &hdr, sizeof(hdr)) < 0) |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 1825 | return -1; |
| 1826 | |
Junio C Hamano | 9d22778 | 2012-04-04 09:12:43 -0700 | [diff] [blame] | 1827 | previous_name = (hdr_version == 4) ? &previous_name_buf : NULL; |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 1828 | for (i = 0; i < entries; i++) { |
| 1829 | struct cache_entry *ce = cache[i]; |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 1830 | if (ce->ce_flags & CE_REMOVE) |
Linus Torvalds | aa16021 | 2005-06-09 15:34:04 -0700 | [diff] [blame] | 1831 | continue; |
Junio C Hamano | e06c43c | 2008-03-30 09:25:52 -0700 | [diff] [blame] | 1832 | if (!ce_uptodate(ce) && is_racy_timestamp(istate, ce)) |
Junio C Hamano | 407c8eb | 2005-12-20 12:12:18 -0800 | [diff] [blame] | 1833 | ce_smudge_racily_clean_entry(ce); |
Jeff King | 83bd743 | 2013-08-27 16:41:12 -0400 | [diff] [blame] | 1834 | if (is_null_sha1(ce->sha1)) { |
| 1835 | static const char msg[] = "cache entry has null sha1: %s"; |
| 1836 | static int allow = -1; |
| 1837 | |
| 1838 | if (allow < 0) |
| 1839 | allow = git_env_bool("GIT_ALLOW_NULL_SHA1", 0); |
| 1840 | if (allow) |
| 1841 | warning(msg, ce->name); |
| 1842 | else |
| 1843 | return error(msg, ce->name); |
| 1844 | } |
Junio C Hamano | 9d22778 | 2012-04-04 09:12:43 -0700 | [diff] [blame] | 1845 | if (ce_write_entry(&c, newfd, ce, previous_name) < 0) |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 1846 | return -1; |
| 1847 | } |
Junio C Hamano | 9d22778 | 2012-04-04 09:12:43 -0700 | [diff] [blame] | 1848 | strbuf_release(&previous_name_buf); |
Junio C Hamano | 1af1c2b | 2006-04-23 16:52:08 -0700 | [diff] [blame] | 1849 | |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 1850 | /* Write extension data here */ |
Junio C Hamano | 4aab5b4 | 2007-04-01 23:26:07 -0700 | [diff] [blame] | 1851 | if (istate->cache_tree) { |
Brandon Casey | f285a2d | 2008-10-09 14:12:12 -0500 | [diff] [blame] | 1852 | struct strbuf sb = STRBUF_INIT; |
Pierre Habouzit | 1dffb8f | 2007-09-25 10:22:44 +0200 | [diff] [blame] | 1853 | |
Pierre Habouzit | 1dffb8f | 2007-09-25 10:22:44 +0200 | [diff] [blame] | 1854 | cache_tree_write(&sb, istate->cache_tree); |
| 1855 | err = write_index_ext_header(&c, newfd, CACHE_EXT_TREE, sb.len) < 0 |
| 1856 | || ce_write(&c, newfd, sb.buf, sb.len) < 0; |
| 1857 | strbuf_release(&sb); |
| 1858 | if (err) |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 1859 | return -1; |
Junio C Hamano | bad68ec | 2006-04-24 21:18:58 -0700 | [diff] [blame] | 1860 | } |
Junio C Hamano | cfc5789 | 2009-12-25 00:30:51 -0800 | [diff] [blame] | 1861 | if (istate->resolve_undo) { |
| 1862 | struct strbuf sb = STRBUF_INIT; |
| 1863 | |
| 1864 | resolve_undo_write(&sb, istate->resolve_undo); |
| 1865 | err = write_index_ext_header(&c, newfd, CACHE_EXT_RESOLVE_UNDO, |
| 1866 | sb.len) < 0 |
| 1867 | || ce_write(&c, newfd, sb.buf, sb.len) < 0; |
| 1868 | strbuf_release(&sb); |
| 1869 | if (err) |
| 1870 | return -1; |
| 1871 | } |
Kjetil Barvik | e1afca4 | 2009-02-23 19:02:57 +0100 | [diff] [blame] | 1872 | |
| 1873 | if (ce_flush(&c, newfd) || fstat(newfd, &st)) |
| 1874 | return -1; |
Kjetil Barvik | 5bcf109 | 2009-03-15 12:38:55 +0100 | [diff] [blame] | 1875 | istate->timestamp.sec = (unsigned int)st.st_mtime; |
| 1876 | istate->timestamp.nsec = ST_MTIME_NSEC(st); |
Kjetil Barvik | e1afca4 | 2009-02-23 19:02:57 +0100 | [diff] [blame] | 1877 | return 0; |
Linus Torvalds | 197ee8c | 2005-04-09 12:09:27 -0700 | [diff] [blame] | 1878 | } |
Miklos Vajna | e46bbcf | 2008-06-27 18:21:58 +0200 | [diff] [blame] | 1879 | |
| 1880 | /* |
| 1881 | * Read the index file that is potentially unmerged into given |
Junio C Hamano | 63e8dc5 | 2008-12-05 17:54:11 -0800 | [diff] [blame] | 1882 | * index_state, dropping any unmerged entries. Returns true if |
Miklos Vajna | e46bbcf | 2008-06-27 18:21:58 +0200 | [diff] [blame] | 1883 | * the index is unmerged. Callers who want to refuse to work |
| 1884 | * from an unmerged state can call this and check its return value, |
| 1885 | * instead of calling read_cache(). |
| 1886 | */ |
| 1887 | int read_index_unmerged(struct index_state *istate) |
| 1888 | { |
| 1889 | int i; |
Junio C Hamano | d1a43f2 | 2008-10-15 16:00:06 -0700 | [diff] [blame] | 1890 | int unmerged = 0; |
Miklos Vajna | e46bbcf | 2008-06-27 18:21:58 +0200 | [diff] [blame] | 1891 | |
| 1892 | read_index(istate); |
Miklos Vajna | e46bbcf | 2008-06-27 18:21:58 +0200 | [diff] [blame] | 1893 | for (i = 0; i < istate->cache_nr; i++) { |
| 1894 | struct cache_entry *ce = istate->cache[i]; |
Junio C Hamano | d1a43f2 | 2008-10-15 16:00:06 -0700 | [diff] [blame] | 1895 | struct cache_entry *new_ce; |
| 1896 | int size, len; |
| 1897 | |
| 1898 | if (!ce_stage(ce)) |
Miklos Vajna | e46bbcf | 2008-06-27 18:21:58 +0200 | [diff] [blame] | 1899 | continue; |
Junio C Hamano | d1a43f2 | 2008-10-15 16:00:06 -0700 | [diff] [blame] | 1900 | unmerged = 1; |
Thomas Gummerer | 68c4f6a | 2012-07-06 18:07:30 +0200 | [diff] [blame] | 1901 | len = ce_namelen(ce); |
Junio C Hamano | d1a43f2 | 2008-10-15 16:00:06 -0700 | [diff] [blame] | 1902 | size = cache_entry_size(len); |
| 1903 | new_ce = xcalloc(1, size); |
Junio C Hamano | d1a43f2 | 2008-10-15 16:00:06 -0700 | [diff] [blame] | 1904 | memcpy(new_ce->name, ce->name, len); |
Thomas Gummerer | b60e188 | 2012-07-11 11:22:37 +0200 | [diff] [blame] | 1905 | new_ce->ce_flags = create_ce_flags(0) | CE_CONFLICTED; |
| 1906 | new_ce->ce_namelen = len; |
Junio C Hamano | d1a43f2 | 2008-10-15 16:00:06 -0700 | [diff] [blame] | 1907 | new_ce->ce_mode = ce->ce_mode; |
| 1908 | if (add_index_entry(istate, new_ce, 0)) |
| 1909 | return error("%s: cannot drop to stage #0", |
Karsten Blees | 5699d17 | 2013-11-14 20:24:37 +0100 | [diff] [blame] | 1910 | new_ce->name); |
Junio C Hamano | d1a43f2 | 2008-10-15 16:00:06 -0700 | [diff] [blame] | 1911 | i = index_name_pos(istate, new_ce->name, len); |
Miklos Vajna | e46bbcf | 2008-06-27 18:21:58 +0200 | [diff] [blame] | 1912 | } |
Junio C Hamano | d1a43f2 | 2008-10-15 16:00:06 -0700 | [diff] [blame] | 1913 | return unmerged; |
Miklos Vajna | e46bbcf | 2008-06-27 18:21:58 +0200 | [diff] [blame] | 1914 | } |
Junio C Hamano | 041aee3 | 2008-07-21 01:24:17 -0700 | [diff] [blame] | 1915 | |
Jeff King | 98fa473 | 2008-10-16 11:07:26 -0400 | [diff] [blame] | 1916 | /* |
| 1917 | * Returns 1 if the path is an "other" path with respect to |
| 1918 | * the index; that is, the path is not mentioned in the index at all, |
| 1919 | * either as a file, a directory with some files in the index, |
| 1920 | * or as an unmerged entry. |
| 1921 | * |
| 1922 | * We helpfully remove a trailing "/" from directories so that |
| 1923 | * the output of read_directory can be used as-is. |
| 1924 | */ |
| 1925 | int index_name_is_other(const struct index_state *istate, const char *name, |
| 1926 | int namelen) |
| 1927 | { |
| 1928 | int pos; |
| 1929 | if (namelen && name[namelen - 1] == '/') |
| 1930 | namelen--; |
| 1931 | pos = index_name_pos(istate, name, namelen); |
| 1932 | if (0 <= pos) |
| 1933 | return 0; /* exact match */ |
| 1934 | pos = -pos - 1; |
| 1935 | if (pos < istate->cache_nr) { |
| 1936 | struct cache_entry *ce = istate->cache[pos]; |
| 1937 | if (ce_namelen(ce) == namelen && |
| 1938 | !memcmp(ce->name, name, namelen)) |
| 1939 | return 0; /* Yup, this one exists unmerged */ |
| 1940 | } |
| 1941 | return 1; |
| 1942 | } |
Lukas Fleischer | 29fb37b | 2013-04-13 15:28:30 +0200 | [diff] [blame] | 1943 | |
Lukas Fleischer | ff36682 | 2013-04-13 15:28:31 +0200 | [diff] [blame] | 1944 | void *read_blob_data_from_index(struct index_state *istate, const char *path, unsigned long *size) |
Lukas Fleischer | 29fb37b | 2013-04-13 15:28:30 +0200 | [diff] [blame] | 1945 | { |
| 1946 | int pos, len; |
| 1947 | unsigned long sz; |
| 1948 | enum object_type type; |
| 1949 | void *data; |
| 1950 | |
| 1951 | len = strlen(path); |
| 1952 | pos = index_name_pos(istate, path, len); |
| 1953 | if (pos < 0) { |
| 1954 | /* |
| 1955 | * We might be in the middle of a merge, in which |
| 1956 | * case we would read stage #2 (ours). |
| 1957 | */ |
| 1958 | int i; |
| 1959 | for (i = -pos - 1; |
| 1960 | (pos < 0 && i < istate->cache_nr && |
| 1961 | !strcmp(istate->cache[i]->name, path)); |
| 1962 | i++) |
| 1963 | if (ce_stage(istate->cache[i]) == 2) |
| 1964 | pos = i; |
| 1965 | } |
| 1966 | if (pos < 0) |
| 1967 | return NULL; |
| 1968 | data = read_sha1_file(istate->cache[pos]->sha1, &type, &sz); |
| 1969 | if (!data || type != OBJ_BLOB) { |
| 1970 | free(data); |
| 1971 | return NULL; |
| 1972 | } |
Lukas Fleischer | ff36682 | 2013-04-13 15:28:31 +0200 | [diff] [blame] | 1973 | if (size) |
| 1974 | *size = sz; |
Lukas Fleischer | 29fb37b | 2013-04-13 15:28:30 +0200 | [diff] [blame] | 1975 | return data; |
| 1976 | } |
Michael Haggerty | 3861253 | 2013-06-20 10:37:51 +0200 | [diff] [blame] | 1977 | |
| 1978 | void stat_validity_clear(struct stat_validity *sv) |
| 1979 | { |
| 1980 | free(sv->sd); |
| 1981 | sv->sd = NULL; |
| 1982 | } |
| 1983 | |
| 1984 | int stat_validity_check(struct stat_validity *sv, const char *path) |
| 1985 | { |
| 1986 | struct stat st; |
| 1987 | |
| 1988 | if (stat(path, &st) < 0) |
| 1989 | return sv->sd == NULL; |
| 1990 | if (!sv->sd) |
| 1991 | return 0; |
| 1992 | return S_ISREG(st.st_mode) && !match_stat_data(sv->sd, &st); |
| 1993 | } |
| 1994 | |
| 1995 | void stat_validity_update(struct stat_validity *sv, int fd) |
| 1996 | { |
| 1997 | struct stat st; |
| 1998 | |
| 1999 | if (fstat(fd, &st) < 0 || !S_ISREG(st.st_mode)) |
| 2000 | stat_validity_clear(sv); |
| 2001 | else { |
| 2002 | if (!sv->sd) |
| 2003 | sv->sd = xcalloc(1, sizeof(struct stat_data)); |
| 2004 | fill_stat_data(sv->sd, &st); |
| 2005 | } |
| 2006 | } |