blob: 5d3c8bd4aaffda9915a3fd62d9d9800f4ac8baff [file] [log] [blame]
Linus Torvalds8bc9a0c2005-04-07 15:16:10 -07001/*
2 * GIT - The information manager from hell
3 *
4 * Copyright (C) Linus Torvalds, 2005
5 */
Junio C Hamano4aab5b42007-04-01 23:26:07 -07006#define NO_THE_INDEX_COMPATIBILITY_MACROS
Linus Torvaldse83c5162005-04-07 15:13:13 -07007#include "cache.h"
Junio C Hamanobad68ec2006-04-24 21:18:58 -07008#include "cache-tree.h"
Linus Torvaldsf35a6d32007-04-09 21:20:29 -07009#include "refs.h"
Alexandre Julliardd6168132007-08-11 23:59:01 +020010#include "dir.h"
Junio C Hamano041aee32008-07-21 01:24:17 -070011#include "tree.h"
12#include "commit.h"
Junio C Hamano39425812008-08-21 01:44:53 -070013#include "blob.h"
Junio C Hamanocfc57892009-12-25 00:30:51 -080014#include "resolve-undo.h"
Junio C Hamano6c9cd162012-04-03 15:53:15 -070015#include "strbuf.h"
16#include "varint.h"
Nguyễn Thái Ngọc Duy5fc2fc82014-06-13 19:19:36 +070017#include "split-index.h"
Nguyễn Thái Ngọc Duyc18b80a2014-06-13 19:19:44 +070018#include "sigchain.h"
Junio C Hamanobad68ec2006-04-24 21:18:58 -070019
Brad King25762722014-01-27 09:45:08 -050020static struct cache_entry *refresh_cache_entry(struct cache_entry *ce,
21 unsigned int options);
Junio C Hamano87b29e52010-01-11 22:29:35 -080022
Thomas Gummererb60e1882012-07-11 11:22:37 +020023/* Mask for the name length in ce_flags in the on-disk index */
24
25#define CE_NAMEMASK (0x0fff)
26
Junio C Hamanobad68ec2006-04-24 21:18:58 -070027/* Index extensions.
28 *
29 * The first letter should be 'A'..'Z' for extensions that are not
30 * necessary for a correct operation (i.e. optimization data).
31 * When new extensions are added that _needs_ to be understood in
32 * order to correctly interpret the index file, pick character that
33 * is outside the range, to cause the reader to abort.
34 */
35
36#define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) )
37#define CACHE_EXT_TREE 0x54524545 /* "TREE" */
Shawn O. Pearceb659b492010-02-02 07:33:28 -080038#define CACHE_EXT_RESOLVE_UNDO 0x52455543 /* "REUC" */
Nguyễn Thái Ngọc Duy5fc2fc82014-06-13 19:19:36 +070039#define CACHE_EXT_LINK 0x6c696e6b /* "link" */
40
41/* changes that can be kept in $GIT_DIR/index (basically all extensions) */
Nguyễn Thái Ngọc Duye0cf0d72014-06-13 19:19:37 +070042#define EXTMASK (RESOLVE_UNDO_CHANGED | CACHE_TREE_CHANGED | \
Nguyễn Thái Ngọc Duyc18b80a2014-06-13 19:19:44 +070043 CE_ENTRY_ADDED | CE_ENTRY_REMOVED | CE_ENTRY_CHANGED | \
44 SPLIT_INDEX_ORDERED)
Linus Torvaldse83c5162005-04-07 15:13:13 -070045
Junio C Hamano228e94f2007-04-01 18:14:06 -070046struct index_state the_index;
Nguyễn Thái Ngọc Duy626f35c2014-06-13 19:19:24 +070047static const char *alternate_index_output;
Johannes Schindelin8fd2cb42006-07-25 21:32:18 -070048
Junio C Hamano9cb76b82008-01-22 23:01:13 -080049static void set_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
50{
51 istate->cache[nr] = ce;
Linus Torvalds96872bc2008-03-21 13:16:24 -070052 add_name_hash(istate, ce);
Junio C Hamano9cb76b82008-01-22 23:01:13 -080053}
54
Linus Torvaldscf558702008-01-22 18:41:14 -080055static void replace_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
56{
57 struct cache_entry *old = istate->cache[nr];
58
Nguyễn Thái Ngọc Duy078a58e2014-06-13 19:19:39 +070059 replace_index_entry_in_base(istate, old, ce);
Karsten Blees20926782013-02-28 00:57:48 +010060 remove_name_hash(istate, old);
Karsten Blees5699d172013-11-14 20:24:37 +010061 free(old);
Linus Torvaldsa22c6372008-02-22 20:37:40 -080062 set_index_entry(istate, nr, ce);
Nguyễn Thái Ngọc Duy078a58e2014-06-13 19:19:39 +070063 ce->ce_flags |= CE_UPDATE_IN_BASE;
Nguyễn Thái Ngọc Duye636a7b2014-06-13 19:19:27 +070064 istate->cache_changed |= CE_ENTRY_CHANGED;
Linus Torvaldscf558702008-01-22 18:41:14 -080065}
66
Petr Baudis81dc2302008-07-21 02:25:56 +020067void rename_index_entry_at(struct index_state *istate, int nr, const char *new_name)
68{
69 struct cache_entry *old = istate->cache[nr], *new;
70 int namelen = strlen(new_name);
71
72 new = xmalloc(cache_entry_size(namelen));
73 copy_cache_entry(new, old);
Karsten Blees419a5972013-11-14 20:22:27 +010074 new->ce_flags &= ~CE_HASHED;
Thomas Gummererb60e1882012-07-11 11:22:37 +020075 new->ce_namelen = namelen;
Nguyễn Thái Ngọc Duy5fc2fc82014-06-13 19:19:36 +070076 new->index = 0;
Petr Baudis81dc2302008-07-21 02:25:56 +020077 memcpy(new->name, new_name, namelen + 1);
78
Nguyễn Thái Ngọc Duya5400ef2014-06-13 19:19:31 +070079 cache_tree_invalidate_path(istate, old->name);
Petr Baudis81dc2302008-07-21 02:25:56 +020080 remove_index_entry_at(istate, nr);
81 add_index_entry(istate, new, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
82}
83
Michael Haggertyc21d39d2013-06-20 10:37:50 +020084void fill_stat_data(struct stat_data *sd, struct stat *st)
85{
86 sd->sd_ctime.sec = (unsigned int)st->st_ctime;
87 sd->sd_mtime.sec = (unsigned int)st->st_mtime;
88 sd->sd_ctime.nsec = ST_CTIME_NSEC(*st);
89 sd->sd_mtime.nsec = ST_MTIME_NSEC(*st);
90 sd->sd_dev = st->st_dev;
91 sd->sd_ino = st->st_ino;
92 sd->sd_uid = st->st_uid;
93 sd->sd_gid = st->st_gid;
94 sd->sd_size = st->st_size;
95}
96
97int match_stat_data(const struct stat_data *sd, struct stat *st)
98{
99 int changed = 0;
100
101 if (sd->sd_mtime.sec != (unsigned int)st->st_mtime)
102 changed |= MTIME_CHANGED;
103 if (trust_ctime && check_stat &&
104 sd->sd_ctime.sec != (unsigned int)st->st_ctime)
105 changed |= CTIME_CHANGED;
106
107#ifdef USE_NSEC
108 if (check_stat && sd->sd_mtime.nsec != ST_MTIME_NSEC(*st))
109 changed |= MTIME_CHANGED;
110 if (trust_ctime && check_stat &&
111 sd->sd_ctime.nsec != ST_CTIME_NSEC(*st))
112 changed |= CTIME_CHANGED;
113#endif
114
115 if (check_stat) {
116 if (sd->sd_uid != (unsigned int) st->st_uid ||
117 sd->sd_gid != (unsigned int) st->st_gid)
118 changed |= OWNER_CHANGED;
119 if (sd->sd_ino != (unsigned int) st->st_ino)
120 changed |= INODE_CHANGED;
121 }
122
123#ifdef USE_STDEV
124 /*
125 * st_dev breaks on network filesystems where different
126 * clients will have different views of what "device"
127 * the filesystem is on
128 */
129 if (check_stat && sd->sd_dev != (unsigned int) st->st_dev)
130 changed |= INODE_CHANGED;
131#endif
132
133 if (sd->sd_size != (unsigned int) st->st_size)
134 changed |= DATA_CHANGED;
135
136 return changed;
137}
138
Junio C Hamano415e96c2005-05-15 14:23:12 -0700139/*
140 * This only updates the "non-critical" parts of the directory
141 * cache, ie the parts that aren't tracked by GIT, and only used
142 * to validate the cache.
143 */
144void fill_stat_cache_info(struct cache_entry *ce, struct stat *st)
145{
Michael Haggertyc21d39d2013-06-20 10:37:50 +0200146 fill_stat_data(&ce->ce_stat_data, st);
Junio C Hamano5f730762006-02-08 21:15:24 -0800147
148 if (assume_unchanged)
Linus Torvalds7a51ed62008-01-14 16:03:17 -0800149 ce->ce_flags |= CE_VALID;
Junio C Hamanoeadb5832008-01-18 23:45:24 -0800150
151 if (S_ISREG(st->st_mode))
152 ce_mark_uptodate(ce);
Junio C Hamano415e96c2005-05-15 14:23:12 -0700153}
154
René Scharfe21a6b9f2013-06-02 17:46:52 +0200155static int ce_compare_data(const struct cache_entry *ce, struct stat *st)
Junio C Hamano29e4d362005-12-20 00:02:15 -0800156{
157 int match = -1;
158 int fd = open(ce->name, O_RDONLY);
159
160 if (fd >= 0) {
161 unsigned char sha1[20];
Junio C Hamanoc4ce46f2011-05-08 01:47:33 -0700162 if (!index_fd(sha1, fd, st, OBJ_BLOB, ce->name, 0))
David Rientjesa89fccd2006-08-17 11:54:57 -0700163 match = hashcmp(sha1, ce->sha1);
Linus Torvalds7f8508e2006-07-31 09:55:15 -0700164 /* index_fd() closed the file descriptor already */
Junio C Hamano29e4d362005-12-20 00:02:15 -0800165 }
166 return match;
167}
168
René Scharfe21a6b9f2013-06-02 17:46:52 +0200169static int ce_compare_link(const struct cache_entry *ce, size_t expected_size)
Junio C Hamano29e4d362005-12-20 00:02:15 -0800170{
171 int match = -1;
Junio C Hamano29e4d362005-12-20 00:02:15 -0800172 void *buffer;
173 unsigned long size;
Nicolas Pitre21666f12007-02-26 14:55:59 -0500174 enum object_type type;
Linus Torvaldsa60272b2008-12-17 09:47:27 -0800175 struct strbuf sb = STRBUF_INIT;
Junio C Hamano29e4d362005-12-20 00:02:15 -0800176
Linus Torvaldsa60272b2008-12-17 09:47:27 -0800177 if (strbuf_readlink(&sb, ce->name, expected_size))
Junio C Hamano29e4d362005-12-20 00:02:15 -0800178 return -1;
Linus Torvaldsa60272b2008-12-17 09:47:27 -0800179
Nicolas Pitre21666f12007-02-26 14:55:59 -0500180 buffer = read_sha1_file(ce->sha1, &type, &size);
Linus Torvaldsa60272b2008-12-17 09:47:27 -0800181 if (buffer) {
182 if (size == sb.len)
183 match = memcmp(buffer, sb.buf, size);
184 free(buffer);
Junio C Hamano29e4d362005-12-20 00:02:15 -0800185 }
Linus Torvaldsa60272b2008-12-17 09:47:27 -0800186 strbuf_release(&sb);
Junio C Hamano29e4d362005-12-20 00:02:15 -0800187 return match;
188}
189
René Scharfe21a6b9f2013-06-02 17:46:52 +0200190static int ce_compare_gitlink(const struct cache_entry *ce)
Linus Torvaldsf35a6d32007-04-09 21:20:29 -0700191{
192 unsigned char sha1[20];
193
194 /*
195 * We don't actually require that the .git directory
Martin Waitz302b9282007-05-21 22:08:28 +0200196 * under GITLINK directory be a valid git directory. It
Linus Torvaldsf35a6d32007-04-09 21:20:29 -0700197 * might even be missing (in case nobody populated that
198 * sub-project).
199 *
200 * If so, we consider it always to match.
201 */
202 if (resolve_gitlink_ref(ce->name, "HEAD", sha1) < 0)
203 return 0;
204 return hashcmp(sha1, ce->sha1);
205}
206
René Scharfe21a6b9f2013-06-02 17:46:52 +0200207static int ce_modified_check_fs(const struct cache_entry *ce, struct stat *st)
Junio C Hamano29e4d362005-12-20 00:02:15 -0800208{
209 switch (st->st_mode & S_IFMT) {
210 case S_IFREG:
211 if (ce_compare_data(ce, st))
212 return DATA_CHANGED;
213 break;
214 case S_IFLNK:
Shawn O. Pearcedc49cd72007-03-06 20:44:37 -0500215 if (ce_compare_link(ce, xsize_t(st->st_size)))
Junio C Hamano29e4d362005-12-20 00:02:15 -0800216 return DATA_CHANGED;
217 break;
Linus Torvaldsa8ee75b2007-04-13 09:24:13 -0700218 case S_IFDIR:
Linus Torvalds7a51ed62008-01-14 16:03:17 -0800219 if (S_ISGITLINK(ce->ce_mode))
Junio C Hamanoc70115b2008-07-29 01:13:44 -0700220 return ce_compare_gitlink(ce) ? DATA_CHANGED : 0;
Junio C Hamano29e4d362005-12-20 00:02:15 -0800221 default:
222 return TYPE_CHANGED;
223 }
224 return 0;
225}
226
René Scharfe21a6b9f2013-06-02 17:46:52 +0200227static int ce_match_stat_basic(const struct cache_entry *ce, struct stat *st)
Linus Torvalds734aab72005-04-09 09:48:20 -0700228{
229 unsigned int changed = 0;
230
Linus Torvalds7a51ed62008-01-14 16:03:17 -0800231 if (ce->ce_flags & CE_REMOVE)
232 return MODE_CHANGED | DATA_CHANGED | TYPE_CHANGED;
233
234 switch (ce->ce_mode & S_IFMT) {
Kay Sievers8ae0a8c2005-05-05 14:38:25 +0200235 case S_IFREG:
236 changed |= !S_ISREG(st->st_mode) ? TYPE_CHANGED : 0;
Junio C Hamano3e09cdf2005-10-11 18:45:33 -0700237 /* We consider only the owner x bit to be relevant for
238 * "mode changes"
239 */
240 if (trust_executable_bit &&
Linus Torvalds7a51ed62008-01-14 16:03:17 -0800241 (0100 & (ce->ce_mode ^ st->st_mode)))
Kay Sieversffbe1ad2005-05-06 15:45:01 +0200242 changed |= MODE_CHANGED;
Kay Sievers8ae0a8c2005-05-05 14:38:25 +0200243 break;
244 case S_IFLNK:
Johannes Sixt78a8d642007-03-02 22:11:30 +0100245 if (!S_ISLNK(st->st_mode) &&
246 (has_symlinks || !S_ISREG(st->st_mode)))
247 changed |= TYPE_CHANGED;
Kay Sievers8ae0a8c2005-05-05 14:38:25 +0200248 break;
Martin Waitz302b9282007-05-21 22:08:28 +0200249 case S_IFGITLINK:
Junio C Hamanoc70115b2008-07-29 01:13:44 -0700250 /* We ignore most of the st_xxx fields for gitlinks */
Linus Torvaldsf35a6d32007-04-09 21:20:29 -0700251 if (!S_ISDIR(st->st_mode))
252 changed |= TYPE_CHANGED;
253 else if (ce_compare_gitlink(ce))
254 changed |= DATA_CHANGED;
Linus Torvaldsa8ee75b2007-04-13 09:24:13 -0700255 return changed;
Kay Sievers8ae0a8c2005-05-05 14:38:25 +0200256 default:
Linus Torvalds7a51ed62008-01-14 16:03:17 -0800257 die("internal error: ce_mode is %o", ce->ce_mode);
Kay Sievers8ae0a8c2005-05-05 14:38:25 +0200258 }
Linus Torvaldsccc4feb2005-04-15 10:44:27 -0700259
Michael Haggertyc21d39d2013-06-20 10:37:50 +0200260 changed |= match_stat_data(&ce->ce_stat_data, st);
Junio C Hamano29e4d362005-12-20 00:02:15 -0800261
Linus Torvaldsf49c2c22008-06-10 10:44:43 -0700262 /* Racily smudged entry? */
Michael Haggertyc21d39d2013-06-20 10:37:50 +0200263 if (!ce->ce_stat_data.sd_size) {
Linus Torvaldsf49c2c22008-06-10 10:44:43 -0700264 if (!is_empty_blob_sha1(ce->sha1))
265 changed |= DATA_CHANGED;
266 }
267
Junio C Hamano407c8eb2005-12-20 12:12:18 -0800268 return changed;
269}
270
René Scharfe21a6b9f2013-06-02 17:46:52 +0200271static int is_racy_timestamp(const struct index_state *istate,
272 const struct cache_entry *ce)
Junio C Hamano6d91da62008-01-21 00:44:50 -0800273{
Junio C Hamano050288d2008-05-03 17:24:28 -0700274 return (!S_ISGITLINK(ce->ce_mode) &&
Kjetil Barvikfba2f382009-02-19 21:08:29 +0100275 istate->timestamp.sec &&
276#ifdef USE_NSEC
277 /* nanosecond timestamped files can also be racy! */
Michael Haggertyc21d39d2013-06-20 10:37:50 +0200278 (istate->timestamp.sec < ce->ce_stat_data.sd_mtime.sec ||
279 (istate->timestamp.sec == ce->ce_stat_data.sd_mtime.sec &&
280 istate->timestamp.nsec <= ce->ce_stat_data.sd_mtime.nsec))
Kjetil Barvikfba2f382009-02-19 21:08:29 +0100281#else
Michael Haggertyc21d39d2013-06-20 10:37:50 +0200282 istate->timestamp.sec <= ce->ce_stat_data.sd_mtime.sec
Kjetil Barvikfba2f382009-02-19 21:08:29 +0100283#endif
284 );
Junio C Hamano6d91da62008-01-21 00:44:50 -0800285}
286
Linus Torvaldsd1f128b2008-03-06 12:46:09 -0800287int ie_match_stat(const struct index_state *istate,
René Scharfe21a6b9f2013-06-02 17:46:52 +0200288 const struct cache_entry *ce, struct stat *st,
Junio C Hamano4bd5b7d2007-11-10 00:15:03 -0800289 unsigned int options)
Junio C Hamano407c8eb2005-12-20 12:12:18 -0800290{
Junio C Hamano5f730762006-02-08 21:15:24 -0800291 unsigned int changed;
Junio C Hamano4bd5b7d2007-11-10 00:15:03 -0800292 int ignore_valid = options & CE_MATCH_IGNORE_VALID;
Nguyễn Thái Ngọc Duy56cac482009-12-14 18:43:58 +0700293 int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;
Junio C Hamano4bd5b7d2007-11-10 00:15:03 -0800294 int assume_racy_is_modified = options & CE_MATCH_RACY_IS_DIRTY;
Junio C Hamano5f730762006-02-08 21:15:24 -0800295
296 /*
297 * If it's marked as always valid in the index, it's
298 * valid whatever the checked-out copy says.
Nguyễn Thái Ngọc Duy56cac482009-12-14 18:43:58 +0700299 *
300 * skip-worktree has the same effect with higher precedence
Junio C Hamano5f730762006-02-08 21:15:24 -0800301 */
Nguyễn Thái Ngọc Duy56cac482009-12-14 18:43:58 +0700302 if (!ignore_skip_worktree && ce_skip_worktree(ce))
303 return 0;
Linus Torvalds7a51ed62008-01-14 16:03:17 -0800304 if (!ignore_valid && (ce->ce_flags & CE_VALID))
Junio C Hamano5f730762006-02-08 21:15:24 -0800305 return 0;
306
Junio C Hamano331fcb52008-11-28 19:56:34 -0800307 /*
308 * Intent-to-add entries have not been added, so the index entry
309 * by definition never matches what is in the work tree until it
310 * actually gets added.
311 */
312 if (ce->ce_flags & CE_INTENT_TO_ADD)
313 return DATA_CHANGED | TYPE_CHANGED | MODE_CHANGED;
314
Junio C Hamano5f730762006-02-08 21:15:24 -0800315 changed = ce_match_stat_basic(ce, st);
Junio C Hamano407c8eb2005-12-20 12:12:18 -0800316
Junio C Hamano29e4d362005-12-20 00:02:15 -0800317 /*
318 * Within 1 second of this sequence:
319 * echo xyzzy >file && git-update-index --add file
320 * running this command:
321 * echo frotz >file
322 * would give a falsely clean cache entry. The mtime and
323 * length match the cache, and other stat fields do not change.
324 *
325 * We could detect this at update-index time (the cache entry
326 * being registered/updated records the same time as "now")
327 * and delay the return from git-update-index, but that would
328 * effectively mean we can make at most one commit per second,
329 * which is not acceptable. Instead, we check cache entries
330 * whose mtime are the same as the index file timestamp more
Junio C Hamano5f730762006-02-08 21:15:24 -0800331 * carefully than others.
Junio C Hamano29e4d362005-12-20 00:02:15 -0800332 */
Junio C Hamano6d91da62008-01-21 00:44:50 -0800333 if (!changed && is_racy_timestamp(istate, ce)) {
Junio C Hamano42f77402006-08-15 21:38:07 -0700334 if (assume_racy_is_modified)
335 changed |= DATA_CHANGED;
336 else
337 changed |= ce_modified_check_fs(ce, st);
338 }
Junio C Hamano29e4d362005-12-20 00:02:15 -0800339
Linus Torvalds734aab72005-04-09 09:48:20 -0700340 return changed;
341}
342
Linus Torvaldsd1f128b2008-03-06 12:46:09 -0800343int ie_modified(const struct index_state *istate,
René Scharfe21a6b9f2013-06-02 17:46:52 +0200344 const struct cache_entry *ce,
345 struct stat *st, unsigned int options)
Junio C Hamanob0391892005-09-19 15:11:15 -0700346{
Junio C Hamano29e4d362005-12-20 00:02:15 -0800347 int changed, changed_fs;
Junio C Hamano4bd5b7d2007-11-10 00:15:03 -0800348
349 changed = ie_match_stat(istate, ce, st, options);
Junio C Hamanob0391892005-09-19 15:11:15 -0700350 if (!changed)
351 return 0;
Junio C Hamanob0391892005-09-19 15:11:15 -0700352 /*
353 * If the mode or type has changed, there's no point in trying
354 * to refresh the entry - it's not going to match
355 */
356 if (changed & (MODE_CHANGED | TYPE_CHANGED))
357 return changed;
358
Junio C Hamanoc70115b2008-07-29 01:13:44 -0700359 /*
360 * Immediately after read-tree or update-index --cacheinfo,
361 * the length field is zero, as we have never even read the
362 * lstat(2) information once, and we cannot trust DATA_CHANGED
363 * returned by ie_match_stat() which in turn was returned by
364 * ce_match_stat_basic() to signal that the filesize of the
365 * blob changed. We have to actually go to the filesystem to
366 * see if the contents match, and if so, should answer "unchanged".
367 *
368 * The logic does not apply to gitlinks, as ce_match_stat_basic()
369 * already has checked the actual HEAD from the filesystem in the
370 * subproject. If ie_match_stat() already said it is different,
371 * then we know it is.
Junio C Hamanob0391892005-09-19 15:11:15 -0700372 */
Junio C Hamanoc70115b2008-07-29 01:13:44 -0700373 if ((changed & DATA_CHANGED) &&
Michael Haggertyc21d39d2013-06-20 10:37:50 +0200374 (S_ISGITLINK(ce->ce_mode) || ce->ce_stat_data.sd_size != 0))
Junio C Hamanob0391892005-09-19 15:11:15 -0700375 return changed;
376
Junio C Hamano29e4d362005-12-20 00:02:15 -0800377 changed_fs = ce_modified_check_fs(ce, st);
378 if (changed_fs)
379 return changed | changed_fs;
Junio C Hamanob0391892005-09-19 15:11:15 -0700380 return 0;
381}
382
Linus Torvalds958ba6c2005-05-20 09:09:18 -0700383int base_name_compare(const char *name1, int len1, int mode1,
384 const char *name2, int len2, int mode2)
385{
386 unsigned char c1, c2;
387 int len = len1 < len2 ? len1 : len2;
388 int cmp;
389
390 cmp = memcmp(name1, name2, len);
391 if (cmp)
392 return cmp;
393 c1 = name1[len];
394 c2 = name2[len];
Linus Torvalds1833a922007-04-11 14:39:12 -0700395 if (!c1 && S_ISDIR(mode1))
Linus Torvalds958ba6c2005-05-20 09:09:18 -0700396 c1 = '/';
Linus Torvalds1833a922007-04-11 14:39:12 -0700397 if (!c2 && S_ISDIR(mode2))
Linus Torvalds958ba6c2005-05-20 09:09:18 -0700398 c2 = '/';
399 return (c1 < c2) ? -1 : (c1 > c2) ? 1 : 0;
400}
401
Linus Torvalds0ab9e1e2008-03-05 18:25:10 -0800402/*
403 * df_name_compare() is identical to base_name_compare(), except it
404 * compares conflicting directory/file entries as equal. Note that
405 * while a directory name compares as equal to a regular file, they
406 * then individually compare _differently_ to a filename that has
407 * a dot after the basename (because '\0' < '.' < '/').
408 *
409 * This is used by routines that want to traverse the git namespace
410 * but then handle conflicting entries together when possible.
411 */
412int df_name_compare(const char *name1, int len1, int mode1,
413 const char *name2, int len2, int mode2)
414{
415 int len = len1 < len2 ? len1 : len2, cmp;
416 unsigned char c1, c2;
417
418 cmp = memcmp(name1, name2, len);
419 if (cmp)
420 return cmp;
421 /* Directories and files compare equal (same length, same name) */
422 if (len1 == len2)
423 return 0;
424 c1 = name1[len];
425 if (!c1 && S_ISDIR(mode1))
426 c1 = '/';
427 c2 = name2[len];
428 if (!c2 && S_ISDIR(mode2))
429 c2 = '/';
430 if (c1 == '/' && !c2)
431 return 0;
432 if (c2 == '/' && !c1)
433 return 0;
434 return c1 - c2;
435}
436
Jeremiah Mahlerccdd4a02014-06-19 19:06:44 -0700437int name_compare(const char *name1, size_t len1, const char *name2, size_t len2)
Linus Torvaldseb38c222005-04-09 09:26:55 -0700438{
Jeremiah Mahlerccdd4a02014-06-19 19:06:44 -0700439 size_t min_len = (len1 < len2) ? len1 : len2;
440 int cmp = memcmp(name1, name2, min_len);
Linus Torvaldseb38c222005-04-09 09:26:55 -0700441 if (cmp)
442 return cmp;
443 if (len1 < len2)
444 return -1;
445 if (len1 > len2)
446 return 1;
Jeremiah Mahlerccdd4a02014-06-19 19:06:44 -0700447 return 0;
448}
449
450int cache_name_stage_compare(const char *name1, int len1, int stage1, const char *name2, int len2, int stage2)
451{
452 int cmp;
453
454 cmp = name_compare(name1, len1, name2, len2);
455 if (cmp)
456 return cmp;
Junio C Hamano5f730762006-02-08 21:15:24 -0800457
Thomas Gummererb60e1882012-07-11 11:22:37 +0200458 if (stage1 < stage2)
Linus Torvalds95fd5bf2005-04-15 22:51:44 -0700459 return -1;
Thomas Gummererb60e1882012-07-11 11:22:37 +0200460 if (stage1 > stage2)
Linus Torvalds95fd5bf2005-04-15 22:51:44 -0700461 return 1;
Linus Torvaldseb38c222005-04-09 09:26:55 -0700462 return 0;
463}
464
Junio C Hamano357e9c62012-09-15 22:44:31 -0700465static int index_name_stage_pos(const struct index_state *istate, const char *name, int namelen, int stage)
Linus Torvaldseb38c222005-04-09 09:26:55 -0700466{
467 int first, last;
468
469 first = 0;
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700470 last = istate->cache_nr;
Linus Torvaldseb38c222005-04-09 09:26:55 -0700471 while (last > first) {
472 int next = (last + first) >> 1;
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700473 struct cache_entry *ce = istate->cache[next];
Thomas Gummererb60e1882012-07-11 11:22:37 +0200474 int cmp = cache_name_stage_compare(name, namelen, stage, ce->name, ce_namelen(ce), ce_stage(ce));
Linus Torvaldseb38c222005-04-09 09:26:55 -0700475 if (!cmp)
Linus Torvalds76e7f4e2005-04-10 22:06:50 -0700476 return next;
Linus Torvaldseb38c222005-04-09 09:26:55 -0700477 if (cmp < 0) {
478 last = next;
479 continue;
480 }
481 first = next+1;
482 }
Linus Torvalds76e7f4e2005-04-10 22:06:50 -0700483 return -first-1;
Linus Torvaldseb38c222005-04-09 09:26:55 -0700484}
485
Thomas Gummererb60e1882012-07-11 11:22:37 +0200486int index_name_pos(const struct index_state *istate, const char *name, int namelen)
487{
488 return index_name_stage_pos(istate, name, namelen, 0);
489}
490
Linus Torvalds7b937ca2005-04-16 12:05:45 -0700491/* Remove entry, return true if there are more entries to go.. */
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700492int remove_index_entry_at(struct index_state *istate, int pos)
Linus Torvalds7b937ca2005-04-16 12:05:45 -0700493{
Linus Torvaldscf558702008-01-22 18:41:14 -0800494 struct cache_entry *ce = istate->cache[pos];
495
Junio C Hamanocfc57892009-12-25 00:30:51 -0800496 record_resolve_undo(istate, ce);
Karsten Blees20926782013-02-28 00:57:48 +0100497 remove_name_hash(istate, ce);
Nguyễn Thái Ngọc Duy045113a2014-06-13 19:19:38 +0700498 save_or_free_index_entry(istate, ce);
Nguyễn Thái Ngọc Duye636a7b2014-06-13 19:19:27 +0700499 istate->cache_changed |= CE_ENTRY_REMOVED;
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700500 istate->cache_nr--;
501 if (pos >= istate->cache_nr)
Linus Torvalds7b937ca2005-04-16 12:05:45 -0700502 return 0;
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700503 memmove(istate->cache + pos,
504 istate->cache + pos + 1,
505 (istate->cache_nr - pos) * sizeof(struct cache_entry *));
Linus Torvalds7b937ca2005-04-16 12:05:45 -0700506 return 1;
507}
508
Kjetil Barvik36419c82009-02-18 23:18:03 +0100509/*
Ondřej Bílka98e023d2013-07-29 10:18:21 +0200510 * Remove all cache entries marked for removal, that is where
Kjetil Barvik36419c82009-02-18 23:18:03 +0100511 * CE_REMOVE is set in ce_flags. This is much more effective than
512 * calling remove_index_entry_at() for each entry to be removed.
513 */
514void remove_marked_cache_entries(struct index_state *istate)
515{
516 struct cache_entry **ce_array = istate->cache;
517 unsigned int i, j;
518
519 for (i = j = 0; i < istate->cache_nr; i++) {
Karsten Blees5699d172013-11-14 20:24:37 +0100520 if (ce_array[i]->ce_flags & CE_REMOVE) {
Karsten Blees20926782013-02-28 00:57:48 +0100521 remove_name_hash(istate, ce_array[i]);
Nguyễn Thái Ngọc Duy045113a2014-06-13 19:19:38 +0700522 save_or_free_index_entry(istate, ce_array[i]);
Karsten Blees5699d172013-11-14 20:24:37 +0100523 }
Kjetil Barvik36419c82009-02-18 23:18:03 +0100524 else
525 ce_array[j++] = ce_array[i];
526 }
Nguyễn Thái Ngọc Duyad837d92014-06-13 19:19:26 +0700527 if (j == istate->cache_nr)
528 return;
Nguyễn Thái Ngọc Duye636a7b2014-06-13 19:19:27 +0700529 istate->cache_changed |= CE_ENTRY_REMOVED;
Kjetil Barvik36419c82009-02-18 23:18:03 +0100530 istate->cache_nr = j;
531}
532
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700533int remove_file_from_index(struct index_state *istate, const char *path)
Linus Torvalds197ee8c2005-04-09 12:09:27 -0700534{
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700535 int pos = index_name_pos(istate, path, strlen(path));
Junio C Hamanoc4e3cca2005-04-17 09:53:35 -0700536 if (pos < 0)
537 pos = -pos-1;
Nguyễn Thái Ngọc Duya5400ef2014-06-13 19:19:31 +0700538 cache_tree_invalidate_path(istate, path);
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700539 while (pos < istate->cache_nr && !strcmp(istate->cache[pos]->name, path))
540 remove_index_entry_at(istate, pos);
Linus Torvalds197ee8c2005-04-09 12:09:27 -0700541 return 0;
542}
543
Johannes Schindelin20314272007-06-29 18:32:46 +0100544static int compare_name(struct cache_entry *ce, const char *path, int namelen)
545{
546 return namelen != ce_namelen(ce) || memcmp(path, ce->name, namelen);
547}
548
549static int index_name_pos_also_unmerged(struct index_state *istate,
550 const char *path, int namelen)
551{
552 int pos = index_name_pos(istate, path, namelen);
553 struct cache_entry *ce;
554
555 if (pos >= 0)
556 return pos;
557
558 /* maybe unmerged? */
559 pos = -1 - pos;
560 if (pos >= istate->cache_nr ||
561 compare_name((ce = istate->cache[pos]), path, namelen))
562 return -1;
563
564 /* order of preference: stage 2, 1, 3 */
565 if (ce_stage(ce) == 1 && pos + 1 < istate->cache_nr &&
566 ce_stage((ce = istate->cache[pos + 1])) == 2 &&
567 !compare_name(ce, path, namelen))
568 pos++;
569 return pos;
570}
571
Linus Torvalds11029522008-03-22 14:22:44 -0700572static int different_name(struct cache_entry *ce, struct cache_entry *alias)
573{
574 int len = ce_namelen(ce);
575 return ce_namelen(alias) != len || memcmp(ce->name, alias->name, len);
576}
577
578/*
579 * If we add a filename that aliases in the cache, we will use the
580 * name that we already have - but we don't want to update the same
581 * alias twice, because that implies that there were actually two
582 * different files with aliasing names!
583 *
584 * So we use the CE_ADDED flag to verify that the alias was an old
585 * one before we accept it as
586 */
Nguyễn Thái Ngọc Duy045113a2014-06-13 19:19:38 +0700587static struct cache_entry *create_alias_ce(struct index_state *istate,
588 struct cache_entry *ce,
589 struct cache_entry *alias)
Linus Torvalds11029522008-03-22 14:22:44 -0700590{
591 int len;
592 struct cache_entry *new;
593
594 if (alias->ce_flags & CE_ADDED)
595 die("Will not add file alias '%s' ('%s' already exists in index)", ce->name, alias->name);
596
597 /* Ok, create the new entry using the name of the existing alias */
598 len = ce_namelen(alias);
599 new = xcalloc(1, cache_entry_size(len));
600 memcpy(new->name, alias->name, len);
601 copy_cache_entry(new, ce);
Nguyễn Thái Ngọc Duy045113a2014-06-13 19:19:38 +0700602 save_or_free_index_entry(istate, ce);
Linus Torvalds11029522008-03-22 14:22:44 -0700603 return new;
604}
605
Nguyễn Thái Ngọc Duyb4b313f2014-02-04 09:20:09 +0700606void set_object_name_for_intent_to_add_entry(struct cache_entry *ce)
Junio C Hamano39425812008-08-21 01:44:53 -0700607{
608 unsigned char sha1[20];
609 if (write_sha1_file("", 0, blob_type, sha1))
610 die("cannot create an empty blob in the object database");
611 hashcpy(ce->sha1, sha1);
612}
613
Junio C Hamano38ed1d82008-05-21 12:04:34 -0700614int add_to_index(struct index_state *istate, const char *path, struct stat *st, int flags)
Johannes Schindelin11be42a2006-07-26 03:52:35 +0200615{
Junio C Hamano38ed1d82008-05-21 12:04:34 -0700616 int size, namelen, was_same;
Linus Torvaldsd177cab2008-05-09 09:11:43 -0700617 mode_t st_mode = st->st_mode;
Linus Torvalds68355502008-03-22 13:19:49 -0700618 struct cache_entry *ce, *alias;
Nguyễn Thái Ngọc Duy56cac482009-12-14 18:43:58 +0700619 unsigned ce_option = CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE|CE_MATCH_RACY_IS_DIRTY;
Junio C Hamano38ed1d82008-05-21 12:04:34 -0700620 int verbose = flags & (ADD_CACHE_VERBOSE | ADD_CACHE_PRETEND);
621 int pretend = flags & ADD_CACHE_PRETEND;
Junio C Hamano39425812008-08-21 01:44:53 -0700622 int intent_only = flags & ADD_CACHE_INTENT;
623 int add_option = (ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE|
624 (intent_only ? ADD_CACHE_NEW_ONLY : 0));
Johannes Schindelin11be42a2006-07-26 03:52:35 +0200625
Linus Torvaldsd177cab2008-05-09 09:11:43 -0700626 if (!S_ISREG(st_mode) && !S_ISLNK(st_mode) && !S_ISDIR(st_mode))
Alex Riesen960b8ad2008-05-12 19:57:45 +0200627 return error("%s: can only add regular files, symbolic links or git-directories", path);
Johannes Schindelin11be42a2006-07-26 03:52:35 +0200628
629 namelen = strlen(path);
Linus Torvaldsd177cab2008-05-09 09:11:43 -0700630 if (S_ISDIR(st_mode)) {
Linus Torvalds09595252007-04-11 14:49:44 -0700631 while (namelen && path[namelen-1] == '/')
632 namelen--;
633 }
Johannes Schindelin11be42a2006-07-26 03:52:35 +0200634 size = cache_entry_size(namelen);
635 ce = xcalloc(1, size);
636 memcpy(ce->name, path, namelen);
Thomas Gummererb60e1882012-07-11 11:22:37 +0200637 ce->ce_namelen = namelen;
Junio C Hamano39425812008-08-21 01:44:53 -0700638 if (!intent_only)
639 fill_stat_cache_info(ce, st);
Junio C Hamano388b2ac2008-11-28 19:55:25 -0800640 else
641 ce->ce_flags |= CE_INTENT_TO_ADD;
Johannes Schindelin11be42a2006-07-26 03:52:35 +0200642
Johannes Sixt78a8d642007-03-02 22:11:30 +0100643 if (trust_executable_bit && has_symlinks)
Linus Torvaldsd177cab2008-05-09 09:11:43 -0700644 ce->ce_mode = create_ce_mode(st_mode);
Junio C Hamano185c9752007-02-16 22:43:48 -0800645 else {
Johannes Sixt78a8d642007-03-02 22:11:30 +0100646 /* If there is an existing entry, pick the mode bits and type
647 * from it, otherwise assume unexecutable regular file.
Johannes Schindelin11be42a2006-07-26 03:52:35 +0200648 */
Junio C Hamano185c9752007-02-16 22:43:48 -0800649 struct cache_entry *ent;
Johannes Schindelin20314272007-06-29 18:32:46 +0100650 int pos = index_name_pos_also_unmerged(istate, path, namelen);
Junio C Hamano185c9752007-02-16 22:43:48 -0800651
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700652 ent = (0 <= pos) ? istate->cache[pos] : NULL;
Linus Torvaldsd177cab2008-05-09 09:11:43 -0700653 ce->ce_mode = ce_mode_from_stat(ent, st_mode);
Johannes Schindelin11be42a2006-07-26 03:52:35 +0200654 }
655
Joshua Jensendc1ae702010-10-03 09:56:45 +0000656 /* When core.ignorecase=true, determine if a directory of the same name but differing
657 * case already exists within the Git repository. If it does, ensure the directory
658 * case of the file being added to the repository matches (is folded into) the existing
659 * entry's directory case.
660 */
661 if (ignore_case) {
662 const char *startPtr = ce->name;
663 const char *ptr = startPtr;
664 while (*ptr) {
665 while (*ptr && *ptr != '/')
666 ++ptr;
667 if (*ptr == '/') {
668 struct cache_entry *foundce;
669 ++ptr;
Eric Sunshined28eec22013-09-17 03:06:16 -0400670 foundce = index_dir_exists(istate, ce->name, ptr - ce->name - 1);
Joshua Jensendc1ae702010-10-03 09:56:45 +0000671 if (foundce) {
672 memcpy((void *)startPtr, foundce->name + (startPtr - ce->name), ptr - startPtr);
673 startPtr = ptr;
674 }
675 }
676 }
677 }
678
Eric Sunshineebbd7432013-09-17 03:06:15 -0400679 alias = index_file_exists(istate, ce->name, ce_namelen(ce), ignore_case);
Linus Torvaldsd177cab2008-05-09 09:11:43 -0700680 if (alias && !ce_stage(alias) && !ie_match_stat(istate, alias, st, ce_option)) {
Junio C Hamano0781b8a2007-07-30 17:12:58 -0700681 /* Nothing changed, really */
682 free(ce);
Junio C Hamano125fd982010-01-24 00:10:20 -0800683 if (!S_ISGITLINK(alias->ce_mode))
684 ce_mark_uptodate(alias);
Linus Torvalds11029522008-03-22 14:22:44 -0700685 alias->ce_flags |= CE_ADDED;
Junio C Hamano0781b8a2007-07-30 17:12:58 -0700686 return 0;
687 }
Junio C Hamano39425812008-08-21 01:44:53 -0700688 if (!intent_only) {
Junio C Hamanoc4ce46f2011-05-08 01:47:33 -0700689 if (index_path(ce->sha1, path, st, HASH_WRITE_OBJECT))
Junio C Hamano39425812008-08-21 01:44:53 -0700690 return error("unable to index file %s", path);
691 } else
Nguyễn Thái Ngọc Duyb4b313f2014-02-04 09:20:09 +0700692 set_object_name_for_intent_to_add_entry(ce);
Junio C Hamano39425812008-08-21 01:44:53 -0700693
Linus Torvalds11029522008-03-22 14:22:44 -0700694 if (ignore_case && alias && different_name(ce, alias))
Nguyễn Thái Ngọc Duy045113a2014-06-13 19:19:38 +0700695 ce = create_alias_ce(istate, ce, alias);
Linus Torvalds11029522008-03-22 14:22:44 -0700696 ce->ce_flags |= CE_ADDED;
Junio C Hamano38ed1d82008-05-21 12:04:34 -0700697
Junio C Hamano3bf0dd12008-07-16 18:48:58 -0700698 /* It was suspected to be racily clean, but it turns out to be Ok */
Junio C Hamano38ed1d82008-05-21 12:04:34 -0700699 was_same = (alias &&
700 !ce_stage(alias) &&
701 !hashcmp(alias->sha1, ce->sha1) &&
702 ce->ce_mode == alias->ce_mode);
703
704 if (pretend)
705 ;
Junio C Hamano39425812008-08-21 01:44:53 -0700706 else if (add_index_entry(istate, ce, add_option))
Alex Riesen960b8ad2008-05-12 19:57:45 +0200707 return error("unable to add %s to index",path);
Junio C Hamano38ed1d82008-05-21 12:04:34 -0700708 if (verbose && !was_same)
Johannes Schindelin11be42a2006-07-26 03:52:35 +0200709 printf("add '%s'\n", path);
Johannes Schindelin11be42a2006-07-26 03:52:35 +0200710 return 0;
711}
712
Junio C Hamano38ed1d82008-05-21 12:04:34 -0700713int add_file_to_index(struct index_state *istate, const char *path, int flags)
Linus Torvaldsd177cab2008-05-09 09:11:43 -0700714{
715 struct stat st;
716 if (lstat(path, &st))
Thomas Rastd824cbb2009-06-27 17:58:46 +0200717 die_errno("unable to stat '%s'", path);
Junio C Hamano38ed1d82008-05-21 12:04:34 -0700718 return add_to_index(istate, path, &st, flags);
Linus Torvaldsd177cab2008-05-09 09:11:43 -0700719}
720
Carlos Rica6640f882007-09-11 05:17:28 +0200721struct cache_entry *make_cache_entry(unsigned int mode,
722 const unsigned char *sha1, const char *path, int stage,
Brad King25762722014-01-27 09:45:08 -0500723 unsigned int refresh_options)
Carlos Rica6640f882007-09-11 05:17:28 +0200724{
725 int size, len;
726 struct cache_entry *ce;
727
Dmitry Potapov7e7abea2008-10-11 20:39:37 +0400728 if (!verify_path(path)) {
729 error("Invalid path '%s'", path);
Carlos Rica6640f882007-09-11 05:17:28 +0200730 return NULL;
Dmitry Potapov7e7abea2008-10-11 20:39:37 +0400731 }
Carlos Rica6640f882007-09-11 05:17:28 +0200732
733 len = strlen(path);
734 size = cache_entry_size(len);
735 ce = xcalloc(1, size);
736
737 hashcpy(ce->sha1, sha1);
738 memcpy(ce->name, path, len);
Thomas Gummererb60e1882012-07-11 11:22:37 +0200739 ce->ce_flags = create_ce_flags(stage);
740 ce->ce_namelen = len;
Carlos Rica6640f882007-09-11 05:17:28 +0200741 ce->ce_mode = create_ce_mode(mode);
742
Brad King25762722014-01-27 09:45:08 -0500743 return refresh_cache_entry(ce, refresh_options);
Carlos Rica6640f882007-09-11 05:17:28 +0200744}
745
Nguyễn Thái Ngọc Duy9c5e6c82013-07-09 22:29:00 +0700746int ce_same_name(const struct cache_entry *a, const struct cache_entry *b)
Linus Torvalds7b937ca2005-04-16 12:05:45 -0700747{
748 int len = ce_namelen(a);
749 return ce_namelen(b) == len && !memcmp(a->name, b->name, len);
750}
751
Linus Torvalds12676602005-06-18 20:21:34 -0700752/*
Linus Torvalds8dcf39c2006-05-18 12:07:31 -0700753 * We fundamentally don't like some paths: we don't want
754 * dot or dot-dot anywhere, and for obvious reasons don't
755 * want to recurse into ".git" either.
756 *
757 * Also, we don't want double slashes or slashes at the
758 * end that can make pathnames ambiguous.
759 */
760static int verify_dotfile(const char *rest)
761{
762 /*
763 * The first character was '.', but that
764 * has already been discarded, we now test
765 * the rest.
766 */
Theo Niessinke0f530f2011-06-08 14:04:41 +0200767
Linus Torvalds8dcf39c2006-05-18 12:07:31 -0700768 /* "." is not allowed */
Theo Niessinke0f530f2011-06-08 14:04:41 +0200769 if (*rest == '\0' || is_dir_sep(*rest))
Linus Torvalds8dcf39c2006-05-18 12:07:31 -0700770 return 0;
771
Theo Niessinke0f530f2011-06-08 14:04:41 +0200772 switch (*rest) {
Linus Torvalds8dcf39c2006-05-18 12:07:31 -0700773 /*
774 * ".git" followed by NUL or slash is bad. This
775 * shares the path end test with the ".." case.
776 */
777 case 'g':
778 if (rest[1] != 'i')
779 break;
780 if (rest[2] != 't')
781 break;
782 rest += 2;
783 /* fallthrough */
784 case '.':
Theo Niessinke0f530f2011-06-08 14:04:41 +0200785 if (rest[1] == '\0' || is_dir_sep(rest[1]))
Linus Torvalds8dcf39c2006-05-18 12:07:31 -0700786 return 0;
787 }
788 return 1;
789}
790
791int verify_path(const char *path)
792{
793 char c;
794
Erik Faye-Lund56948cb2011-05-27 18:00:40 +0200795 if (has_dos_drive_prefix(path))
796 return 0;
797
Linus Torvalds8dcf39c2006-05-18 12:07:31 -0700798 goto inside;
799 for (;;) {
800 if (!c)
801 return 1;
Erik Faye-Lund56948cb2011-05-27 18:00:40 +0200802 if (is_dir_sep(c)) {
Linus Torvalds8dcf39c2006-05-18 12:07:31 -0700803inside:
804 c = *path++;
Junio C Hamano3bdf09c2011-06-06 20:49:06 -0700805 if ((c == '.' && !verify_dotfile(path)) ||
806 is_dir_sep(c) || c == '\0')
807 return 0;
Linus Torvalds8dcf39c2006-05-18 12:07:31 -0700808 }
809 c = *path++;
810 }
811}
812
813/*
Linus Torvalds12676602005-06-18 20:21:34 -0700814 * Do we have another file that has the beginning components being a
815 * proper superset of the name we're trying to add?
816 */
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700817static int has_file_name(struct index_state *istate,
818 const struct cache_entry *ce, int pos, int ok_to_replace)
Linus Torvalds12676602005-06-18 20:21:34 -0700819{
820 int retval = 0;
821 int len = ce_namelen(ce);
Junio C Hamanob1557252005-06-25 02:25:29 -0700822 int stage = ce_stage(ce);
Linus Torvalds12676602005-06-18 20:21:34 -0700823 const char *name = ce->name;
824
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700825 while (pos < istate->cache_nr) {
826 struct cache_entry *p = istate->cache[pos++];
Linus Torvalds12676602005-06-18 20:21:34 -0700827
828 if (len >= ce_namelen(p))
829 break;
830 if (memcmp(name, p->name, len))
831 break;
Junio C Hamanob1557252005-06-25 02:25:29 -0700832 if (ce_stage(p) != stage)
833 continue;
Linus Torvalds12676602005-06-18 20:21:34 -0700834 if (p->name[len] != '/')
835 continue;
Linus Torvalds7a51ed62008-01-14 16:03:17 -0800836 if (p->ce_flags & CE_REMOVE)
Junio C Hamano21cd8d02007-03-30 01:55:37 -0700837 continue;
Linus Torvalds12676602005-06-18 20:21:34 -0700838 retval = -1;
839 if (!ok_to_replace)
840 break;
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700841 remove_index_entry_at(istate, --pos);
Linus Torvalds12676602005-06-18 20:21:34 -0700842 }
843 return retval;
844}
845
846/*
847 * Do we have another file with a pathname that is a proper
848 * subset of the name we're trying to add?
849 */
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700850static int has_dir_name(struct index_state *istate,
851 const struct cache_entry *ce, int pos, int ok_to_replace)
Linus Torvalds12676602005-06-18 20:21:34 -0700852{
853 int retval = 0;
Junio C Hamanob1557252005-06-25 02:25:29 -0700854 int stage = ce_stage(ce);
Linus Torvalds12676602005-06-18 20:21:34 -0700855 const char *name = ce->name;
856 const char *slash = name + ce_namelen(ce);
857
858 for (;;) {
859 int len;
860
861 for (;;) {
862 if (*--slash == '/')
863 break;
864 if (slash <= ce->name)
865 return retval;
866 }
867 len = slash - name;
868
Thomas Gummererb60e1882012-07-11 11:22:37 +0200869 pos = index_name_stage_pos(istate, name, len, stage);
Linus Torvalds12676602005-06-18 20:21:34 -0700870 if (pos >= 0) {
Junio C Hamano21cd8d02007-03-30 01:55:37 -0700871 /*
872 * Found one, but not so fast. This could
873 * be a marker that says "I was here, but
874 * I am being removed". Such an entry is
875 * not a part of the resulting tree, and
876 * it is Ok to have a directory at the same
877 * path.
878 */
Junio C Hamano077c48d2008-01-22 21:24:21 -0800879 if (!(istate->cache[pos]->ce_flags & CE_REMOVE)) {
Junio C Hamano21cd8d02007-03-30 01:55:37 -0700880 retval = -1;
881 if (!ok_to_replace)
882 break;
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700883 remove_index_entry_at(istate, pos);
Junio C Hamano21cd8d02007-03-30 01:55:37 -0700884 continue;
885 }
Linus Torvalds12676602005-06-18 20:21:34 -0700886 }
Junio C Hamano21cd8d02007-03-30 01:55:37 -0700887 else
888 pos = -pos-1;
Linus Torvalds12676602005-06-18 20:21:34 -0700889
890 /*
891 * Trivial optimization: if we find an entry that
892 * already matches the sub-directory, then we know
Junio C Hamanob1557252005-06-25 02:25:29 -0700893 * we're ok, and we can exit.
Linus Torvalds12676602005-06-18 20:21:34 -0700894 */
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700895 while (pos < istate->cache_nr) {
896 struct cache_entry *p = istate->cache[pos];
Junio C Hamanob1557252005-06-25 02:25:29 -0700897 if ((ce_namelen(p) <= len) ||
898 (p->name[len] != '/') ||
899 memcmp(p->name, name, len))
900 break; /* not our subdirectory */
Junio C Hamano077c48d2008-01-22 21:24:21 -0800901 if (ce_stage(p) == stage && !(p->ce_flags & CE_REMOVE))
902 /*
903 * p is at the same stage as our entry, and
Junio C Hamanob1557252005-06-25 02:25:29 -0700904 * is a subdirectory of what we are looking
905 * at, so we cannot have conflicts at our
906 * level or anything shorter.
907 */
908 return retval;
909 pos++;
Linus Torvalds12676602005-06-18 20:21:34 -0700910 }
911 }
912 return retval;
913}
914
Junio C Hamano0f1e4f02005-05-07 21:48:12 -0700915/* We may be in a situation where we already have path/file and path
916 * is being added, or we already have path and path/file is being
917 * added. Either one would result in a nonsense tree that has path
918 * twice when git-write-tree tries to write it out. Prevent it.
Junio C Hamanoa6080a02007-06-07 00:04:01 -0700919 *
Junio C Hamano192268c2005-05-07 21:55:21 -0700920 * If ok-to-replace is specified, we remove the conflicting entries
921 * from the cache so the caller should recompute the insert position.
922 * When this happens, we return non-zero.
Junio C Hamano0f1e4f02005-05-07 21:48:12 -0700923 */
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700924static int check_file_directory_conflict(struct index_state *istate,
925 const struct cache_entry *ce,
926 int pos, int ok_to_replace)
Junio C Hamano0f1e4f02005-05-07 21:48:12 -0700927{
Junio C Hamano21cd8d02007-03-30 01:55:37 -0700928 int retval;
929
930 /*
931 * When ce is an "I am going away" entry, we allow it to be added
932 */
Linus Torvalds7a51ed62008-01-14 16:03:17 -0800933 if (ce->ce_flags & CE_REMOVE)
Junio C Hamano21cd8d02007-03-30 01:55:37 -0700934 return 0;
935
Junio C Hamano0f1e4f02005-05-07 21:48:12 -0700936 /*
Linus Torvalds12676602005-06-18 20:21:34 -0700937 * We check if the path is a sub-path of a subsequent pathname
938 * first, since removing those will not change the position
Junio C Hamano21cd8d02007-03-30 01:55:37 -0700939 * in the array.
Junio C Hamano0f1e4f02005-05-07 21:48:12 -0700940 */
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700941 retval = has_file_name(istate, ce, pos, ok_to_replace);
Junio C Hamano21cd8d02007-03-30 01:55:37 -0700942
Linus Torvalds12676602005-06-18 20:21:34 -0700943 /*
944 * Then check if the path might have a clashing sub-directory
945 * before it.
Junio C Hamano0f1e4f02005-05-07 21:48:12 -0700946 */
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700947 return retval + has_dir_name(istate, ce, pos, ok_to_replace);
Junio C Hamano0f1e4f02005-05-07 21:48:12 -0700948}
949
Junio C Hamanoaf3785d2007-08-09 13:42:50 -0700950static int add_index_entry_with_check(struct index_state *istate, struct cache_entry *ce, int option)
Linus Torvalds197ee8c2005-04-09 12:09:27 -0700951{
952 int pos;
Junio C Hamano192268c2005-05-07 21:55:21 -0700953 int ok_to_add = option & ADD_CACHE_OK_TO_ADD;
954 int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE;
Junio C Hamanob1557252005-06-25 02:25:29 -0700955 int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK;
Junio C Hamano39425812008-08-21 01:44:53 -0700956 int new_only = option & ADD_CACHE_NEW_ONLY;
Junio C Hamano5f730762006-02-08 21:15:24 -0800957
Nguyễn Thái Ngọc Duyce7c6142014-06-13 19:19:42 +0700958 if (!(option & ADD_CACHE_KEEP_CACHE_TREE))
959 cache_tree_invalidate_path(istate, ce->name);
Thomas Gummererb60e1882012-07-11 11:22:37 +0200960 pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce));
Linus Torvalds197ee8c2005-04-09 12:09:27 -0700961
Junio C Hamano3e09cdf2005-10-11 18:45:33 -0700962 /* existing match? Just replace it. */
Linus Torvalds76e7f4e2005-04-10 22:06:50 -0700963 if (pos >= 0) {
Junio C Hamano39425812008-08-21 01:44:53 -0700964 if (!new_only)
965 replace_index_entry(istate, pos, ce);
Linus Torvalds197ee8c2005-04-09 12:09:27 -0700966 return 0;
967 }
Linus Torvalds76e7f4e2005-04-10 22:06:50 -0700968 pos = -pos-1;
Linus Torvalds197ee8c2005-04-09 12:09:27 -0700969
Linus Torvalds7b937ca2005-04-16 12:05:45 -0700970 /*
971 * Inserting a merged entry ("stage 0") into the index
972 * will always replace all non-merged entries..
973 */
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700974 if (pos < istate->cache_nr && ce_stage(ce) == 0) {
975 while (ce_same_name(istate->cache[pos], ce)) {
Linus Torvalds7b937ca2005-04-16 12:05:45 -0700976 ok_to_add = 1;
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700977 if (!remove_index_entry_at(istate, pos))
Linus Torvalds7b937ca2005-04-16 12:05:45 -0700978 break;
979 }
980 }
981
Linus Torvalds121481a2005-04-10 11:32:54 -0700982 if (!ok_to_add)
983 return -1;
Linus Torvalds8dcf39c2006-05-18 12:07:31 -0700984 if (!verify_path(ce->name))
Dmitry Potapov7e7abea2008-10-11 20:39:37 +0400985 return error("Invalid path '%s'", ce->name);
Linus Torvalds121481a2005-04-10 11:32:54 -0700986
Junio C Hamano3e09cdf2005-10-11 18:45:33 -0700987 if (!skip_df_check &&
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700988 check_file_directory_conflict(istate, ce, pos, ok_to_replace)) {
Junio C Hamano192268c2005-05-07 21:55:21 -0700989 if (!ok_to_replace)
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700990 return error("'%s' appears as both a file and as a directory",
991 ce->name);
Thomas Gummererb60e1882012-07-11 11:22:37 +0200992 pos = index_name_stage_pos(istate, ce->name, ce_namelen(ce), ce_stage(ce));
Junio C Hamano192268c2005-05-07 21:55:21 -0700993 pos = -pos-1;
994 }
Junio C Hamanoaf3785d2007-08-09 13:42:50 -0700995 return pos + 1;
996}
997
998int add_index_entry(struct index_state *istate, struct cache_entry *ce, int option)
999{
1000 int pos;
1001
1002 if (option & ADD_CACHE_JUST_APPEND)
1003 pos = istate->cache_nr;
1004 else {
1005 int ret;
1006 ret = add_index_entry_with_check(istate, ce, option);
1007 if (ret <= 0)
1008 return ret;
1009 pos = ret - 1;
1010 }
Junio C Hamano0f1e4f02005-05-07 21:48:12 -07001011
Linus Torvalds197ee8c2005-04-09 12:09:27 -07001012 /* Make sure the array is big enough .. */
Dmitry S. Dolzhenko999f5662014-03-04 02:32:01 +04001013 ALLOC_GROW(istate->cache, istate->cache_nr + 1, istate->cache_alloc);
Linus Torvalds197ee8c2005-04-09 12:09:27 -07001014
1015 /* Add it in.. */
Junio C Hamano4aab5b42007-04-01 23:26:07 -07001016 istate->cache_nr++;
Junio C Hamanoaf3785d2007-08-09 13:42:50 -07001017 if (istate->cache_nr > pos + 1)
Junio C Hamano4aab5b42007-04-01 23:26:07 -07001018 memmove(istate->cache + pos + 1,
1019 istate->cache + pos,
1020 (istate->cache_nr - pos - 1) * sizeof(ce));
Linus Torvaldscf558702008-01-22 18:41:14 -08001021 set_index_entry(istate, pos, ce);
Nguyễn Thái Ngọc Duye636a7b2014-06-13 19:19:27 +07001022 istate->cache_changed |= CE_ENTRY_ADDED;
Linus Torvalds197ee8c2005-04-09 12:09:27 -07001023 return 0;
1024}
1025
Linus Torvalds405e5b22006-05-19 09:56:35 -07001026/*
1027 * "refresh" does not calculate a new sha1 file or bring the
1028 * cache up-to-date for mode/content changes. But what it
1029 * _does_ do is to "re-match" the stat information of a file
1030 * with the cache, so that you can refresh the cache for a
1031 * file that hasn't been changed but where the stat entry is
1032 * out of date.
1033 *
1034 * For example, you'd want to do this after doing a "git-read-tree",
1035 * to link up the stat cache details with the proper files.
1036 */
Junio C Hamano4aab5b42007-04-01 23:26:07 -07001037static struct cache_entry *refresh_cache_ent(struct index_state *istate,
Junio C Hamano4bd5b7d2007-11-10 00:15:03 -08001038 struct cache_entry *ce,
Jeff Kingd05e6972011-11-18 06:11:08 -05001039 unsigned int options, int *err,
1040 int *changed_ret)
Linus Torvalds405e5b22006-05-19 09:56:35 -07001041{
1042 struct stat st;
1043 struct cache_entry *updated;
1044 int changed, size;
Brad King25762722014-01-27 09:45:08 -05001045 int refresh = options & CE_MATCH_REFRESH;
Junio C Hamano4bd5b7d2007-11-10 00:15:03 -08001046 int ignore_valid = options & CE_MATCH_IGNORE_VALID;
Nguyễn Thái Ngọc Duy56cac482009-12-14 18:43:58 +07001047 int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;
Brad King2e2e7ec2014-01-27 09:45:07 -05001048 int ignore_missing = options & CE_MATCH_IGNORE_MISSING;
Linus Torvalds405e5b22006-05-19 09:56:35 -07001049
Brad King25762722014-01-27 09:45:08 -05001050 if (!refresh || ce_uptodate(ce))
Junio C Hamanoeadb5832008-01-18 23:45:24 -08001051 return ce;
1052
Marius Storm-Olsenaa9349d2008-05-30 14:38:35 +02001053 /*
Nguyễn Thái Ngọc Duy56cac482009-12-14 18:43:58 +07001054 * CE_VALID or CE_SKIP_WORKTREE means the user promised us
1055 * that the change to the work tree does not matter and told
1056 * us not to worry.
Marius Storm-Olsenaa9349d2008-05-30 14:38:35 +02001057 */
Nguyễn Thái Ngọc Duy56cac482009-12-14 18:43:58 +07001058 if (!ignore_skip_worktree && ce_skip_worktree(ce)) {
1059 ce_mark_uptodate(ce);
1060 return ce;
1061 }
Marius Storm-Olsenaa9349d2008-05-30 14:38:35 +02001062 if (!ignore_valid && (ce->ce_flags & CE_VALID)) {
1063 ce_mark_uptodate(ce);
1064 return ce;
1065 }
1066
Johannes Schindelin8fd2cb42006-07-25 21:32:18 -07001067 if (lstat(ce->name, &st) < 0) {
Brad King2e2e7ec2014-01-27 09:45:07 -05001068 if (ignore_missing && errno == ENOENT)
1069 return ce;
Junio C Hamanoec0cc702007-04-01 21:34:34 -07001070 if (err)
1071 *err = errno;
Johannes Schindelin8fd2cb42006-07-25 21:32:18 -07001072 return NULL;
1073 }
Linus Torvalds405e5b22006-05-19 09:56:35 -07001074
Junio C Hamano4bd5b7d2007-11-10 00:15:03 -08001075 changed = ie_match_stat(istate, ce, &st, options);
Jeff Kingd05e6972011-11-18 06:11:08 -05001076 if (changed_ret)
1077 *changed_ret = changed;
Linus Torvalds405e5b22006-05-19 09:56:35 -07001078 if (!changed) {
Junio C Hamano4bd5b7d2007-11-10 00:15:03 -08001079 /*
1080 * The path is unchanged. If we were told to ignore
1081 * valid bit, then we did the actual stat check and
1082 * found that the entry is unmodified. If the entry
1083 * is not marked VALID, this is the place to mark it
1084 * valid again, under "assume unchanged" mode.
1085 */
1086 if (ignore_valid && assume_unchanged &&
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001087 !(ce->ce_flags & CE_VALID))
Linus Torvalds405e5b22006-05-19 09:56:35 -07001088 ; /* mark this one VALID again */
Junio C Hamanoeadb5832008-01-18 23:45:24 -08001089 else {
1090 /*
1091 * We do not mark the index itself "modified"
1092 * because CE_UPTODATE flag is in-core only;
1093 * we are not going to write this change out.
1094 */
Junio C Hamano125fd982010-01-24 00:10:20 -08001095 if (!S_ISGITLINK(ce->ce_mode))
1096 ce_mark_uptodate(ce);
Johannes Schindelin8fd2cb42006-07-25 21:32:18 -07001097 return ce;
Junio C Hamanoeadb5832008-01-18 23:45:24 -08001098 }
Linus Torvalds405e5b22006-05-19 09:56:35 -07001099 }
1100
Junio C Hamano4bd5b7d2007-11-10 00:15:03 -08001101 if (ie_modified(istate, ce, &st, options)) {
Junio C Hamanoec0cc702007-04-01 21:34:34 -07001102 if (err)
1103 *err = EINVAL;
Johannes Schindelin8fd2cb42006-07-25 21:32:18 -07001104 return NULL;
1105 }
Linus Torvalds405e5b22006-05-19 09:56:35 -07001106
1107 size = ce_size(ce);
1108 updated = xmalloc(size);
1109 memcpy(updated, ce, size);
1110 fill_stat_cache_info(updated, &st);
Junio C Hamano4bd5b7d2007-11-10 00:15:03 -08001111 /*
1112 * If ignore_valid is not set, we should leave CE_VALID bit
1113 * alone. Otherwise, paths marked with --no-assume-unchanged
1114 * (i.e. things to be edited) will reacquire CE_VALID bit
1115 * automatically, which is not really what we want.
Linus Torvalds405e5b22006-05-19 09:56:35 -07001116 */
Junio C Hamano4bd5b7d2007-11-10 00:15:03 -08001117 if (!ignore_valid && assume_unchanged &&
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001118 !(ce->ce_flags & CE_VALID))
1119 updated->ce_flags &= ~CE_VALID;
Linus Torvalds405e5b22006-05-19 09:56:35 -07001120
Nguyễn Thái Ngọc Duye636a7b2014-06-13 19:19:27 +07001121 /* istate->cache_changed is updated in the caller */
Linus Torvalds405e5b22006-05-19 09:56:35 -07001122 return updated;
1123}
1124
Matthieu Moy3deffc52009-08-21 10:57:59 +02001125static void show_file(const char * fmt, const char * name, int in_porcelain,
Jonathan Nieder046613c2011-02-22 22:43:23 +00001126 int * first, const char *header_msg)
Matthieu Moy3deffc52009-08-21 10:57:59 +02001127{
1128 if (in_porcelain && *first && header_msg) {
1129 printf("%s\n", header_msg);
Junio C Hamanocd2b8ae2011-08-25 14:46:52 -07001130 *first = 0;
Matthieu Moy3deffc52009-08-21 10:57:59 +02001131 }
1132 printf(fmt, name);
1133}
1134
Nguyễn Thái Ngọc Duy9b2d6142013-07-14 15:35:54 +07001135int refresh_index(struct index_state *istate, unsigned int flags,
1136 const struct pathspec *pathspec,
Jonathan Nieder046613c2011-02-22 22:43:23 +00001137 char *seen, const char *header_msg)
Linus Torvalds405e5b22006-05-19 09:56:35 -07001138{
1139 int i;
1140 int has_errors = 0;
1141 int really = (flags & REFRESH_REALLY) != 0;
1142 int allow_unmerged = (flags & REFRESH_UNMERGED) != 0;
1143 int quiet = (flags & REFRESH_QUIET) != 0;
1144 int not_new = (flags & REFRESH_IGNORE_MISSING) != 0;
Johannes Schindelin5fdeacb2008-05-14 18:03:45 +01001145 int ignore_submodules = (flags & REFRESH_IGNORE_SUBMODULES) != 0;
Matthieu Moy3deffc52009-08-21 10:57:59 +02001146 int first = 1;
1147 int in_porcelain = (flags & REFRESH_IN_PORCELAIN);
Brad King25762722014-01-27 09:45:08 -05001148 unsigned int options = (CE_MATCH_REFRESH |
1149 (really ? CE_MATCH_IGNORE_VALID : 0) |
Brad King2e2e7ec2014-01-27 09:45:07 -05001150 (not_new ? CE_MATCH_IGNORE_MISSING : 0));
Jeff King4bd4e732011-11-18 06:11:28 -05001151 const char *modified_fmt;
Jeff King73b7eae2011-11-18 06:13:08 -05001152 const char *deleted_fmt;
1153 const char *typechange_fmt;
1154 const char *added_fmt;
Jeff King4bd4e732011-11-18 06:11:28 -05001155 const char *unmerged_fmt;
Linus Torvalds405e5b22006-05-19 09:56:35 -07001156
Jeff King4bd4e732011-11-18 06:11:28 -05001157 modified_fmt = (in_porcelain ? "M\t%s\n" : "%s: needs update\n");
Jeff King73b7eae2011-11-18 06:13:08 -05001158 deleted_fmt = (in_porcelain ? "D\t%s\n" : "%s: needs update\n");
1159 typechange_fmt = (in_porcelain ? "T\t%s\n" : "%s needs update\n");
1160 added_fmt = (in_porcelain ? "A\t%s\n" : "%s needs update\n");
Jeff King4bd4e732011-11-18 06:11:28 -05001161 unmerged_fmt = (in_porcelain ? "U\t%s\n" : "%s: needs merge\n");
Junio C Hamano4aab5b42007-04-01 23:26:07 -07001162 for (i = 0; i < istate->cache_nr; i++) {
Linus Torvalds405e5b22006-05-19 09:56:35 -07001163 struct cache_entry *ce, *new;
Junio C Hamanoec0cc702007-04-01 21:34:34 -07001164 int cache_errno = 0;
Jeff King73b7eae2011-11-18 06:13:08 -05001165 int changed = 0;
Junio C Hamano3d1f1482012-02-17 10:11:05 -08001166 int filtered = 0;
Junio C Hamanoec0cc702007-04-01 21:34:34 -07001167
Junio C Hamano4aab5b42007-04-01 23:26:07 -07001168 ce = istate->cache[i];
Johannes Schindelin5fdeacb2008-05-14 18:03:45 +01001169 if (ignore_submodules && S_ISGITLINK(ce->ce_mode))
1170 continue;
1171
Nguyễn Thái Ngọc Duy429bb402014-01-24 20:40:28 +07001172 if (pathspec && !ce_path_match(ce, pathspec, seen))
Junio C Hamano3d1f1482012-02-17 10:11:05 -08001173 filtered = 1;
1174
Linus Torvalds405e5b22006-05-19 09:56:35 -07001175 if (ce_stage(ce)) {
Junio C Hamano4aab5b42007-04-01 23:26:07 -07001176 while ((i < istate->cache_nr) &&
1177 ! strcmp(istate->cache[i]->name, ce->name))
Linus Torvalds405e5b22006-05-19 09:56:35 -07001178 i++;
1179 i--;
1180 if (allow_unmerged)
1181 continue;
Junio C Hamano3d1f1482012-02-17 10:11:05 -08001182 if (!filtered)
1183 show_file(unmerged_fmt, ce->name, in_porcelain,
1184 &first, header_msg);
Linus Torvalds405e5b22006-05-19 09:56:35 -07001185 has_errors = 1;
1186 continue;
1187 }
1188
Junio C Hamano3d1f1482012-02-17 10:11:05 -08001189 if (filtered)
Alexandre Julliardd6168132007-08-11 23:59:01 +02001190 continue;
1191
Jeff King73b7eae2011-11-18 06:13:08 -05001192 new = refresh_cache_ent(istate, ce, options, &cache_errno, &changed);
Johannes Schindelin8fd2cb42006-07-25 21:32:18 -07001193 if (new == ce)
Linus Torvalds405e5b22006-05-19 09:56:35 -07001194 continue;
Johannes Schindelin8fd2cb42006-07-25 21:32:18 -07001195 if (!new) {
Jeff King73b7eae2011-11-18 06:13:08 -05001196 const char *fmt;
1197
Johannes Schindelin8fd2cb42006-07-25 21:32:18 -07001198 if (really && cache_errno == EINVAL) {
Linus Torvalds405e5b22006-05-19 09:56:35 -07001199 /* If we are doing --really-refresh that
1200 * means the index is not valid anymore.
1201 */
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001202 ce->ce_flags &= ~CE_VALID;
Nguyễn Thái Ngọc Duy078a58e2014-06-13 19:19:39 +07001203 ce->ce_flags |= CE_UPDATE_IN_BASE;
Nguyễn Thái Ngọc Duye636a7b2014-06-13 19:19:27 +07001204 istate->cache_changed |= CE_ENTRY_CHANGED;
Linus Torvalds405e5b22006-05-19 09:56:35 -07001205 }
1206 if (quiet)
1207 continue;
Jeff King73b7eae2011-11-18 06:13:08 -05001208
1209 if (cache_errno == ENOENT)
1210 fmt = deleted_fmt;
1211 else if (ce->ce_flags & CE_INTENT_TO_ADD)
1212 fmt = added_fmt; /* must be before other checks */
1213 else if (changed & TYPE_CHANGED)
1214 fmt = typechange_fmt;
1215 else
1216 fmt = modified_fmt;
1217 show_file(fmt,
1218 ce->name, in_porcelain, &first, header_msg);
Linus Torvalds405e5b22006-05-19 09:56:35 -07001219 has_errors = 1;
1220 continue;
1221 }
Linus Torvaldscf558702008-01-22 18:41:14 -08001222
1223 replace_index_entry(istate, i, new);
Linus Torvalds405e5b22006-05-19 09:56:35 -07001224 }
1225 return has_errors;
1226}
1227
Brad King25762722014-01-27 09:45:08 -05001228static struct cache_entry *refresh_cache_entry(struct cache_entry *ce,
1229 unsigned int options)
Junio C Hamanoec0cc702007-04-01 21:34:34 -07001230{
Brad King25762722014-01-27 09:45:08 -05001231 return refresh_cache_ent(&the_index, ce, options, NULL, NULL);
Junio C Hamanoec0cc702007-04-01 21:34:34 -07001232}
1233
Junio C Hamanodb3b3132012-04-03 15:53:09 -07001234
1235/*****************************************************************
1236 * Index File I/O
1237 *****************************************************************/
1238
Junio C Hamano9d227782012-04-04 09:12:43 -07001239#define INDEX_FORMAT_DEFAULT 3
1240
Thomas Gummerer3c09d682014-02-23 21:49:59 +01001241static int index_format_config(const char *var, const char *value, void *cb)
1242{
1243 unsigned int *version = cb;
1244 if (!strcmp(var, "index.version")) {
1245 *version = git_config_int(var, value);
1246 return 0;
1247 }
1248 return 1;
1249}
1250
Thomas Gummerer136347d2014-02-23 21:49:57 +01001251static unsigned int get_index_format_default(void)
1252{
1253 char *envversion = getenv("GIT_INDEX_VERSION");
Thomas Gummerer3c09d682014-02-23 21:49:59 +01001254 char *endp;
1255 unsigned int version = INDEX_FORMAT_DEFAULT;
Thomas Gummerer136347d2014-02-23 21:49:57 +01001256
Thomas Gummerer3c09d682014-02-23 21:49:59 +01001257 if (!envversion) {
1258 git_config(index_format_config, &version);
1259 if (version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) {
1260 warning(_("index.version set, but the value is invalid.\n"
Thomas Gummerer136347d2014-02-23 21:49:57 +01001261 "Using version %i"), INDEX_FORMAT_DEFAULT);
Thomas Gummerer3c09d682014-02-23 21:49:59 +01001262 return INDEX_FORMAT_DEFAULT;
Thomas Gummerer136347d2014-02-23 21:49:57 +01001263 }
1264 return version;
1265 }
Thomas Gummerer3c09d682014-02-23 21:49:59 +01001266
1267 version = strtoul(envversion, &endp, 10);
1268 if (*endp ||
1269 version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) {
1270 warning(_("GIT_INDEX_VERSION set, but the value is invalid.\n"
1271 "Using version %i"), INDEX_FORMAT_DEFAULT);
1272 version = INDEX_FORMAT_DEFAULT;
1273 }
1274 return version;
Thomas Gummerer136347d2014-02-23 21:49:57 +01001275}
1276
Junio C Hamanodb3b3132012-04-03 15:53:09 -07001277/*
1278 * dev/ino/uid/gid/size are also just tracked to the low 32 bits
1279 * Again - this is just a (very strong in practice) heuristic that
1280 * the inode hasn't changed.
1281 *
1282 * We save the fields in big-endian order to allow using the
1283 * index file over NFS transparently.
1284 */
1285struct ondisk_cache_entry {
1286 struct cache_time ctime;
1287 struct cache_time mtime;
Thomas Gummerer7800c1e2013-08-18 21:41:51 +02001288 uint32_t dev;
1289 uint32_t ino;
1290 uint32_t mode;
1291 uint32_t uid;
1292 uint32_t gid;
1293 uint32_t size;
Junio C Hamanodb3b3132012-04-03 15:53:09 -07001294 unsigned char sha1[20];
Thomas Gummerer7800c1e2013-08-18 21:41:51 +02001295 uint16_t flags;
Junio C Hamanodb3b3132012-04-03 15:53:09 -07001296 char name[FLEX_ARRAY]; /* more */
1297};
1298
1299/*
1300 * This struct is used when CE_EXTENDED bit is 1
1301 * The struct must match ondisk_cache_entry exactly from
1302 * ctime till flags
1303 */
1304struct ondisk_cache_entry_extended {
1305 struct cache_time ctime;
1306 struct cache_time mtime;
Thomas Gummerer7800c1e2013-08-18 21:41:51 +02001307 uint32_t dev;
1308 uint32_t ino;
1309 uint32_t mode;
1310 uint32_t uid;
1311 uint32_t gid;
1312 uint32_t size;
Junio C Hamanodb3b3132012-04-03 15:53:09 -07001313 unsigned char sha1[20];
Thomas Gummerer7800c1e2013-08-18 21:41:51 +02001314 uint16_t flags;
1315 uint16_t flags2;
Junio C Hamanodb3b3132012-04-03 15:53:09 -07001316 char name[FLEX_ARRAY]; /* more */
1317};
1318
Junio C Hamano6c9cd162012-04-03 15:53:15 -07001319/* These are only used for v3 or lower */
Junio C Hamanodb3b3132012-04-03 15:53:09 -07001320#define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,name) + (len) + 8) & ~7)
1321#define ondisk_cache_entry_size(len) align_flex_name(ondisk_cache_entry,len)
1322#define ondisk_cache_entry_extended_size(len) align_flex_name(ondisk_cache_entry_extended,len)
1323#define ondisk_ce_size(ce) (((ce)->ce_flags & CE_EXTENDED) ? \
1324 ondisk_cache_entry_extended_size(ce_namelen(ce)) : \
1325 ondisk_cache_entry_size(ce_namelen(ce)))
1326
Junio C Hamanobad68ec2006-04-24 21:18:58 -07001327static int verify_hdr(struct cache_header *hdr, unsigned long size)
Linus Torvaldse83c5162005-04-07 15:13:13 -07001328{
Nicolas Pitre9126f002008-10-01 14:05:20 -04001329 git_SHA_CTX c;
Junio C Hamanobad68ec2006-04-24 21:18:58 -07001330 unsigned char sha1[20];
Junio C Hamano0136bac2012-04-03 15:53:12 -07001331 int hdr_version;
Linus Torvaldse83c5162005-04-07 15:13:13 -07001332
Linus Torvaldsccc4feb2005-04-15 10:44:27 -07001333 if (hdr->hdr_signature != htonl(CACHE_SIGNATURE))
Linus Torvaldse83c5162005-04-07 15:13:13 -07001334 return error("bad signature");
Junio C Hamano0136bac2012-04-03 15:53:12 -07001335 hdr_version = ntohl(hdr->hdr_version);
Nguyễn Thái Ngọc Duyb82a7b52013-02-22 19:09:24 +07001336 if (hdr_version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < hdr_version)
Junio C Hamano0136bac2012-04-03 15:53:12 -07001337 return error("bad index version %d", hdr_version);
Nicolas Pitre9126f002008-10-01 14:05:20 -04001338 git_SHA1_Init(&c);
1339 git_SHA1_Update(&c, hdr, size - 20);
1340 git_SHA1_Final(sha1, &c);
David Rientjesa89fccd2006-08-17 11:54:57 -07001341 if (hashcmp(sha1, (unsigned char *)hdr + size - 20))
Linus Torvaldsca9be052005-04-20 12:36:41 -07001342 return error("bad index file sha1 signature");
Linus Torvaldse83c5162005-04-07 15:13:13 -07001343 return 0;
1344}
1345
Junio C Hamano4aab5b42007-04-01 23:26:07 -07001346static int read_index_extension(struct index_state *istate,
1347 const char *ext, void *data, unsigned long sz)
Junio C Hamanobad68ec2006-04-24 21:18:58 -07001348{
1349 switch (CACHE_EXT(ext)) {
1350 case CACHE_EXT_TREE:
Junio C Hamano4aab5b42007-04-01 23:26:07 -07001351 istate->cache_tree = cache_tree_read(data, sz);
Junio C Hamanobad68ec2006-04-24 21:18:58 -07001352 break;
Junio C Hamanocfc57892009-12-25 00:30:51 -08001353 case CACHE_EXT_RESOLVE_UNDO:
1354 istate->resolve_undo = resolve_undo_read(data, sz);
1355 break;
Nguyễn Thái Ngọc Duy5fc2fc82014-06-13 19:19:36 +07001356 case CACHE_EXT_LINK:
1357 if (read_link_extension(istate, data, sz))
1358 return -1;
1359 break;
Junio C Hamanobad68ec2006-04-24 21:18:58 -07001360 default:
1361 if (*ext < 'A' || 'Z' < *ext)
1362 return error("index uses %.4s extension, which we do not understand",
1363 ext);
1364 fprintf(stderr, "ignoring %.4s extension\n", ext);
1365 break;
1366 }
1367 return 0;
1368}
1369
Junio C Hamano4aab5b42007-04-01 23:26:07 -07001370int read_index(struct index_state *istate)
Linus Torvaldse83c5162005-04-07 15:13:13 -07001371{
Junio C Hamano4aab5b42007-04-01 23:26:07 -07001372 return read_index_from(istate, get_index_file());
Johannes Schindelin8fd2cb42006-07-25 21:32:18 -07001373}
1374
Junio C Hamano3fc22b52012-04-03 15:53:13 -07001375static struct cache_entry *cache_entry_from_ondisk(struct ondisk_cache_entry *ondisk,
1376 unsigned int flags,
1377 const char *name,
1378 size_t len)
1379{
1380 struct cache_entry *ce = xmalloc(cache_entry_size(len));
1381
Jeff Kingc3d8da52014-01-23 16:26:42 -05001382 ce->ce_stat_data.sd_ctime.sec = get_be32(&ondisk->ctime.sec);
1383 ce->ce_stat_data.sd_mtime.sec = get_be32(&ondisk->mtime.sec);
1384 ce->ce_stat_data.sd_ctime.nsec = get_be32(&ondisk->ctime.nsec);
1385 ce->ce_stat_data.sd_mtime.nsec = get_be32(&ondisk->mtime.nsec);
1386 ce->ce_stat_data.sd_dev = get_be32(&ondisk->dev);
1387 ce->ce_stat_data.sd_ino = get_be32(&ondisk->ino);
1388 ce->ce_mode = get_be32(&ondisk->mode);
1389 ce->ce_stat_data.sd_uid = get_be32(&ondisk->uid);
1390 ce->ce_stat_data.sd_gid = get_be32(&ondisk->gid);
1391 ce->ce_stat_data.sd_size = get_be32(&ondisk->size);
Thomas Gummererb60e1882012-07-11 11:22:37 +02001392 ce->ce_flags = flags & ~CE_NAMEMASK;
1393 ce->ce_namelen = len;
Nguyễn Thái Ngọc Duy5fc2fc82014-06-13 19:19:36 +07001394 ce->index = 0;
Junio C Hamano3fc22b52012-04-03 15:53:13 -07001395 hashcpy(ce->sha1, ondisk->sha1);
1396 memcpy(ce->name, name, len);
1397 ce->name[len] = '\0';
1398 return ce;
1399}
1400
Junio C Hamano6c9cd162012-04-03 15:53:15 -07001401/*
1402 * Adjacent cache entries tend to share the leading paths, so it makes
1403 * sense to only store the differences in later entries. In the v4
1404 * on-disk format of the index, each on-disk cache entry stores the
1405 * number of bytes to be stripped from the end of the previous name,
1406 * and the bytes to append to the result, to come up with its name.
1407 */
1408static unsigned long expand_name_field(struct strbuf *name, const char *cp_)
1409{
1410 const unsigned char *ep, *cp = (const unsigned char *)cp_;
1411 size_t len = decode_varint(&cp);
1412
1413 if (name->len < len)
1414 die("malformed name field in the index");
1415 strbuf_remove(name, name->len - len, len);
1416 for (ep = cp; *ep; ep++)
1417 ; /* find the end */
1418 strbuf_add(name, cp, ep - cp);
1419 return (const char *)ep + 1 - cp_;
1420}
1421
Junio C Hamano936f53d2012-04-03 15:53:11 -07001422static struct cache_entry *create_from_disk(struct ondisk_cache_entry *ondisk,
Junio C Hamano6c9cd162012-04-03 15:53:15 -07001423 unsigned long *ent_size,
1424 struct strbuf *previous_name)
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001425{
René Scharfedebed2a2011-10-24 23:59:14 +02001426 struct cache_entry *ce;
Junio C Hamano7fec10b2008-01-18 23:42:00 -08001427 size_t len;
Nguyễn Thái Ngọc Duy06aaaa02008-10-01 11:04:01 +07001428 const char *name;
René Scharfedebed2a2011-10-24 23:59:14 +02001429 unsigned int flags;
1430
1431 /* On-disk flags are just 16 bits */
Jeff Kingc3d8da52014-01-23 16:26:42 -05001432 flags = get_be16(&ondisk->flags);
René Scharfedebed2a2011-10-24 23:59:14 +02001433 len = flags & CE_NAMEMASK;
1434
1435 if (flags & CE_EXTENDED) {
1436 struct ondisk_cache_entry_extended *ondisk2;
1437 int extended_flags;
1438 ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;
Jeff Kingc3d8da52014-01-23 16:26:42 -05001439 extended_flags = get_be16(&ondisk2->flags2) << 16;
René Scharfedebed2a2011-10-24 23:59:14 +02001440 /* We do not yet understand any bit out of CE_EXTENDED_FLAGS */
1441 if (extended_flags & ~CE_EXTENDED_FLAGS)
1442 die("Unknown index entry format %08x", extended_flags);
1443 flags |= extended_flags;
1444 name = ondisk2->name;
1445 }
1446 else
1447 name = ondisk->name;
1448
Junio C Hamano6c9cd162012-04-03 15:53:15 -07001449 if (!previous_name) {
1450 /* v3 and earlier */
1451 if (len == CE_NAMEMASK)
1452 len = strlen(name);
1453 ce = cache_entry_from_ondisk(ondisk, flags, name, len);
René Scharfedebed2a2011-10-24 23:59:14 +02001454
Junio C Hamano6c9cd162012-04-03 15:53:15 -07001455 *ent_size = ondisk_ce_size(ce);
1456 } else {
1457 unsigned long consumed;
1458 consumed = expand_name_field(previous_name, name);
1459 ce = cache_entry_from_ondisk(ondisk, flags,
1460 previous_name->buf,
1461 previous_name->len);
Junio C Hamano7fec10b2008-01-18 23:42:00 -08001462
Junio C Hamano6c9cd162012-04-03 15:53:15 -07001463 *ent_size = (name - ((char *)ondisk)) + consumed;
1464 }
René Scharfedebed2a2011-10-24 23:59:14 +02001465 return ce;
Linus Torvaldscf558702008-01-22 18:41:14 -08001466}
1467
Johannes Schindelin8fd2cb42006-07-25 21:32:18 -07001468/* remember to discard_cache() before reading a different cache! */
Nguyễn Thái Ngọc Duy3e52f702014-06-13 19:19:51 +07001469int do_read_index(struct index_state *istate, const char *path, int must_exist)
Johannes Schindelin8fd2cb42006-07-25 21:32:18 -07001470{
Linus Torvaldse83c5162005-04-07 15:13:13 -07001471 int fd, i;
1472 struct stat st;
René Scharfedebed2a2011-10-24 23:59:14 +02001473 unsigned long src_offset;
Linus Torvaldse83c5162005-04-07 15:13:13 -07001474 struct cache_header *hdr;
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001475 void *mmap;
1476 size_t mmap_size;
Junio C Hamano6c9cd162012-04-03 15:53:15 -07001477 struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;
Linus Torvaldse83c5162005-04-07 15:13:13 -07001478
Junio C Hamano913e0e92008-08-23 12:57:30 -07001479 if (istate->initialized)
Junio C Hamano4aab5b42007-04-01 23:26:07 -07001480 return istate->cache_nr;
Linus Torvalds5d1a5c02005-10-01 13:24:27 -07001481
Kjetil Barvikfba2f382009-02-19 21:08:29 +01001482 istate->timestamp.sec = 0;
1483 istate->timestamp.nsec = 0;
Johannes Schindelin8fd2cb42006-07-25 21:32:18 -07001484 fd = open(path, O_RDONLY);
Linus Torvalds5d1a5c02005-10-01 13:24:27 -07001485 if (fd < 0) {
Nguyễn Thái Ngọc Duy5fc2fc82014-06-13 19:19:36 +07001486 if (!must_exist && errno == ENOENT)
Linus Torvalds5d1a5c02005-10-01 13:24:27 -07001487 return 0;
Nguyễn Thái Ngọc Duy5fc2fc82014-06-13 19:19:36 +07001488 die_errno("%s: index file open failed", path);
Linus Torvalds5d1a5c02005-10-01 13:24:27 -07001489 }
Linus Torvaldse83c5162005-04-07 15:13:13 -07001490
Luiz Fernando N. Capitulino3511a372007-04-25 11:18:17 -03001491 if (fstat(fd, &st))
Thomas Rastd824cbb2009-06-27 17:58:46 +02001492 die_errno("cannot stat the open index");
Luiz Fernando N. Capitulino3511a372007-04-25 11:18:17 -03001493
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001494 mmap_size = xsize_t(st.st_size);
1495 if (mmap_size < sizeof(struct cache_header) + 20)
Luiz Fernando N. Capitulino3511a372007-04-25 11:18:17 -03001496 die("index file smaller than expected");
1497
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001498 mmap = xmmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001499 if (mmap == MAP_FAILED)
Thomas Rast0721c312009-06-27 17:58:47 +02001500 die_errno("unable to map index file");
Nguyễn Thái Ngọc Duy57d84f82012-08-06 18:27:09 +07001501 close(fd);
Linus Torvaldse83c5162005-04-07 15:13:13 -07001502
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001503 hdr = mmap;
1504 if (verify_hdr(hdr, mmap_size) < 0)
Linus Torvaldse83c5162005-04-07 15:13:13 -07001505 goto unmap;
1506
Nguyễn Thái Ngọc Duye93021b2014-06-13 19:19:35 +07001507 hashcpy(istate->sha1, (const unsigned char *)hdr + mmap_size - 20);
Junio C Hamano9d227782012-04-04 09:12:43 -07001508 istate->version = ntohl(hdr->hdr_version);
Junio C Hamano4aab5b42007-04-01 23:26:07 -07001509 istate->cache_nr = ntohl(hdr->hdr_entries);
1510 istate->cache_alloc = alloc_nr(istate->cache_nr);
Felipe Contrerasc4aa3162013-05-30 08:56:19 -05001511 istate->cache = xcalloc(istate->cache_alloc, sizeof(*istate->cache));
Junio C Hamano913e0e92008-08-23 12:57:30 -07001512 istate->initialized = 1;
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001513
Junio C Hamano9d227782012-04-04 09:12:43 -07001514 if (istate->version == 4)
Junio C Hamano6c9cd162012-04-03 15:53:15 -07001515 previous_name = &previous_name_buf;
1516 else
1517 previous_name = NULL;
1518
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001519 src_offset = sizeof(*hdr);
Junio C Hamano4aab5b42007-04-01 23:26:07 -07001520 for (i = 0; i < istate->cache_nr; i++) {
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001521 struct ondisk_cache_entry *disk_ce;
Junio C Hamano4aab5b42007-04-01 23:26:07 -07001522 struct cache_entry *ce;
Junio C Hamano936f53d2012-04-03 15:53:11 -07001523 unsigned long consumed;
Junio C Hamano4aab5b42007-04-01 23:26:07 -07001524
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001525 disk_ce = (struct ondisk_cache_entry *)((char *)mmap + src_offset);
Junio C Hamano6c9cd162012-04-03 15:53:15 -07001526 ce = create_from_disk(disk_ce, &consumed, previous_name);
Linus Torvaldscf558702008-01-22 18:41:14 -08001527 set_index_entry(istate, i, ce);
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001528
Junio C Hamano936f53d2012-04-03 15:53:11 -07001529 src_offset += consumed;
Linus Torvaldse83c5162005-04-07 15:13:13 -07001530 }
Junio C Hamano6c9cd162012-04-03 15:53:15 -07001531 strbuf_release(&previous_name_buf);
Kjetil Barvikfba2f382009-02-19 21:08:29 +01001532 istate->timestamp.sec = st.st_mtime;
Kjetil Barvikc06ff492009-03-04 18:47:40 +01001533 istate->timestamp.nsec = ST_MTIME_NSEC(st);
Kjetil Barvikfba2f382009-02-19 21:08:29 +01001534
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001535 while (src_offset <= mmap_size - 20 - 8) {
Junio C Hamanobad68ec2006-04-24 21:18:58 -07001536 /* After an array of active_nr index entries,
1537 * there can be arbitrary number of extended
1538 * sections, each of which is prefixed with
1539 * extension name (4-byte) and section length
1540 * in 4-byte network byte order.
1541 */
Nathaniel W Filardo07cc8ec2009-12-27 01:11:21 -05001542 uint32_t extsize;
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001543 memcpy(&extsize, (char *)mmap + src_offset + 4, 4);
Junio C Hamanobad68ec2006-04-24 21:18:58 -07001544 extsize = ntohl(extsize);
Junio C Hamano4aab5b42007-04-01 23:26:07 -07001545 if (read_index_extension(istate,
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001546 (const char *) mmap + src_offset,
1547 (char *) mmap + src_offset + 8,
Florian Forster1d7f1712006-06-18 17:18:09 +02001548 extsize) < 0)
Junio C Hamanobad68ec2006-04-24 21:18:58 -07001549 goto unmap;
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001550 src_offset += 8;
1551 src_offset += extsize;
Junio C Hamanobad68ec2006-04-24 21:18:58 -07001552 }
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001553 munmap(mmap, mmap_size);
Junio C Hamano4aab5b42007-04-01 23:26:07 -07001554 return istate->cache_nr;
Linus Torvaldse83c5162005-04-07 15:13:13 -07001555
1556unmap:
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001557 munmap(mmap, mmap_size);
Linus Torvalds5d1a5c02005-10-01 13:24:27 -07001558 die("index file corrupt");
Linus Torvaldse83c5162005-04-07 15:13:13 -07001559}
1560
Nguyễn Thái Ngọc Duy5fc2fc82014-06-13 19:19:36 +07001561int read_index_from(struct index_state *istate, const char *path)
1562{
1563 struct split_index *split_index;
1564 int ret;
1565
1566 /* istate->initialized covers both .git/index and .git/sharedindex.xxx */
1567 if (istate->initialized)
1568 return istate->cache_nr;
1569
1570 ret = do_read_index(istate, path, 0);
1571 split_index = istate->split_index;
1572 if (!split_index)
1573 return ret;
1574
1575 if (is_null_sha1(split_index->base_sha1))
1576 return ret;
Nguyễn Thái Ngọc Duy5fc2fc82014-06-13 19:19:36 +07001577
1578 if (split_index->base)
1579 discard_index(split_index->base);
1580 else
1581 split_index->base = xcalloc(1, sizeof(*split_index->base));
1582 ret = do_read_index(split_index->base,
1583 git_path("sharedindex.%s",
1584 sha1_to_hex(split_index->base_sha1)), 1);
1585 if (hashcmp(split_index->base_sha1, split_index->base->sha1))
1586 die("broken index, expect %s in %s, got %s",
1587 sha1_to_hex(split_index->base_sha1),
1588 git_path("sharedindex.%s",
1589 sha1_to_hex(split_index->base_sha1)),
1590 sha1_to_hex(split_index->base->sha1));
1591 merge_base_index(istate);
1592 return ret;
1593}
1594
Junio C Hamanofa7b3c22008-11-12 11:52:35 -08001595int is_index_unborn(struct index_state *istate)
1596{
René Scharfedebed2a2011-10-24 23:59:14 +02001597 return (!istate->cache_nr && !istate->timestamp.sec);
Junio C Hamanofa7b3c22008-11-12 11:52:35 -08001598}
1599
Junio C Hamano4aab5b42007-04-01 23:26:07 -07001600int discard_index(struct index_state *istate)
Johannes Schindelin6d297f82006-07-08 18:42:41 +02001601{
René Scharfedebed2a2011-10-24 23:59:14 +02001602 int i;
1603
Nguyễn Thái Ngọc Duy5fc2fc82014-06-13 19:19:36 +07001604 for (i = 0; i < istate->cache_nr; i++) {
1605 if (istate->cache[i]->index &&
1606 istate->split_index &&
1607 istate->split_index->base &&
1608 istate->cache[i]->index <= istate->split_index->base->cache_nr &&
1609 istate->cache[i] == istate->split_index->base->cache[istate->cache[i]->index - 1])
1610 continue;
René Scharfedebed2a2011-10-24 23:59:14 +02001611 free(istate->cache[i]);
Nguyễn Thái Ngọc Duy5fc2fc82014-06-13 19:19:36 +07001612 }
Junio C Hamanocfc57892009-12-25 00:30:51 -08001613 resolve_undo_clear_index(istate);
Junio C Hamano4aab5b42007-04-01 23:26:07 -07001614 istate->cache_nr = 0;
1615 istate->cache_changed = 0;
Kjetil Barvikfba2f382009-02-19 21:08:29 +01001616 istate->timestamp.sec = 0;
1617 istate->timestamp.nsec = 0;
Karsten Blees20926782013-02-28 00:57:48 +01001618 free_name_hash(istate);
Junio C Hamano4aab5b42007-04-01 23:26:07 -07001619 cache_tree_free(&(istate->cache_tree));
Junio C Hamano913e0e92008-08-23 12:57:30 -07001620 istate->initialized = 0;
René Scharfea0fc4db2013-06-09 19:39:18 +02001621 free(istate->cache);
1622 istate->cache = NULL;
1623 istate->cache_alloc = 0;
Nguyễn Thái Ngọc Duy5fc2fc82014-06-13 19:19:36 +07001624 discard_split_index(istate);
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001625 return 0;
Johannes Schindelin6d297f82006-07-08 18:42:41 +02001626}
1627
Linus Torvaldsd1f128b2008-03-06 12:46:09 -08001628int unmerged_index(const struct index_state *istate)
Daniel Barkalow94a57282008-02-07 11:40:13 -05001629{
1630 int i;
1631 for (i = 0; i < istate->cache_nr; i++) {
1632 if (ce_stage(istate->cache[i]))
1633 return 1;
1634 }
1635 return 0;
1636}
1637
Linus Torvalds4990aad2005-04-20 12:16:57 -07001638#define WRITE_BUFFER_SIZE 8192
Brian Gerstbf0f9102005-05-18 08:14:09 -04001639static unsigned char write_buffer[WRITE_BUFFER_SIZE];
Linus Torvalds4990aad2005-04-20 12:16:57 -07001640static unsigned long write_buffer_len;
1641
Nicolas Pitre9126f002008-10-01 14:05:20 -04001642static int ce_write_flush(git_SHA_CTX *context, int fd)
Junio C Hamano6015c282006-08-08 14:47:32 -07001643{
1644 unsigned int buffered = write_buffer_len;
1645 if (buffered) {
Nicolas Pitre9126f002008-10-01 14:05:20 -04001646 git_SHA1_Update(context, write_buffer, buffered);
Andy Whitcroft93822c22007-01-08 15:58:23 +00001647 if (write_in_full(fd, write_buffer, buffered) != buffered)
Junio C Hamano6015c282006-08-08 14:47:32 -07001648 return -1;
1649 write_buffer_len = 0;
1650 }
1651 return 0;
1652}
1653
Nicolas Pitre9126f002008-10-01 14:05:20 -04001654static int ce_write(git_SHA_CTX *context, int fd, void *data, unsigned int len)
Linus Torvalds4990aad2005-04-20 12:16:57 -07001655{
1656 while (len) {
1657 unsigned int buffered = write_buffer_len;
1658 unsigned int partial = WRITE_BUFFER_SIZE - buffered;
1659 if (partial > len)
1660 partial = len;
1661 memcpy(write_buffer + buffered, data, partial);
1662 buffered += partial;
1663 if (buffered == WRITE_BUFFER_SIZE) {
Junio C Hamano6015c282006-08-08 14:47:32 -07001664 write_buffer_len = buffered;
1665 if (ce_write_flush(context, fd))
Linus Torvalds4990aad2005-04-20 12:16:57 -07001666 return -1;
1667 buffered = 0;
1668 }
1669 write_buffer_len = buffered;
1670 len -= partial;
Florian Forster1d7f1712006-06-18 17:18:09 +02001671 data = (char *) data + partial;
Junio C Hamanoa6080a02007-06-07 00:04:01 -07001672 }
1673 return 0;
Linus Torvalds4990aad2005-04-20 12:16:57 -07001674}
1675
Nicolas Pitre9126f002008-10-01 14:05:20 -04001676static int write_index_ext_header(git_SHA_CTX *context, int fd,
Dennis Stosbergac58c7b2006-05-28 21:08:08 +02001677 unsigned int ext, unsigned int sz)
Junio C Hamanobad68ec2006-04-24 21:18:58 -07001678{
1679 ext = htonl(ext);
1680 sz = htonl(sz);
David Rientjes968a1d62006-08-14 13:38:14 -07001681 return ((ce_write(context, fd, &ext, 4) < 0) ||
1682 (ce_write(context, fd, &sz, 4) < 0)) ? -1 : 0;
Junio C Hamanobad68ec2006-04-24 21:18:58 -07001683}
1684
Nguyễn Thái Ngọc Duye93021b2014-06-13 19:19:35 +07001685static int ce_flush(git_SHA_CTX *context, int fd, unsigned char *sha1)
Linus Torvalds4990aad2005-04-20 12:16:57 -07001686{
1687 unsigned int left = write_buffer_len;
Linus Torvaldsca9be052005-04-20 12:36:41 -07001688
Linus Torvalds4990aad2005-04-20 12:16:57 -07001689 if (left) {
1690 write_buffer_len = 0;
Nicolas Pitre9126f002008-10-01 14:05:20 -04001691 git_SHA1_Update(context, write_buffer, left);
Linus Torvalds4990aad2005-04-20 12:16:57 -07001692 }
Linus Torvaldsca9be052005-04-20 12:36:41 -07001693
Qingning Huo2c865d92005-09-11 14:27:47 +01001694 /* Flush first if not enough space for SHA1 signature */
1695 if (left + 20 > WRITE_BUFFER_SIZE) {
Andy Whitcroft93822c22007-01-08 15:58:23 +00001696 if (write_in_full(fd, write_buffer, left) != left)
Qingning Huo2c865d92005-09-11 14:27:47 +01001697 return -1;
1698 left = 0;
1699 }
1700
Linus Torvaldsca9be052005-04-20 12:36:41 -07001701 /* Append the SHA1 signature at the end */
Nicolas Pitre9126f002008-10-01 14:05:20 -04001702 git_SHA1_Final(write_buffer + left, context);
Nguyễn Thái Ngọc Duye93021b2014-06-13 19:19:35 +07001703 hashcpy(sha1, write_buffer + left);
Linus Torvaldsca9be052005-04-20 12:36:41 -07001704 left += 20;
Andy Whitcroft93822c22007-01-08 15:58:23 +00001705 return (write_in_full(fd, write_buffer, left) != left) ? -1 : 0;
Linus Torvalds4990aad2005-04-20 12:16:57 -07001706}
1707
Junio C Hamano407c8eb2005-12-20 12:12:18 -08001708static void ce_smudge_racily_clean_entry(struct cache_entry *ce)
1709{
1710 /*
1711 * The only thing we care about in this function is to smudge the
1712 * falsely clean entry due to touch-update-touch race, so we leave
1713 * everything else as they are. We are called for entries whose
Michael Haggertyc21d39d2013-06-20 10:37:50 +02001714 * ce_stat_data.sd_mtime match the index file mtime.
Junio C Hamanoc70115b2008-07-29 01:13:44 -07001715 *
1716 * Note that this actually does not do much for gitlinks, for
1717 * which ce_match_stat_basic() always goes to the actual
1718 * contents. The caller checks with is_racy_timestamp() which
1719 * always says "no" for gitlinks, so we are not called for them ;-)
Junio C Hamano407c8eb2005-12-20 12:12:18 -08001720 */
1721 struct stat st;
1722
1723 if (lstat(ce->name, &st) < 0)
1724 return;
1725 if (ce_match_stat_basic(ce, &st))
1726 return;
1727 if (ce_modified_check_fs(ce, &st)) {
Junio C Hamano4b3511b2005-12-20 14:18:47 -08001728 /* This is "racily clean"; smudge it. Note that this
1729 * is a tricky code. At first glance, it may appear
1730 * that it can break with this sequence:
1731 *
1732 * $ echo xyzzy >frotz
1733 * $ git-update-index --add frotz
1734 * $ : >frotz
1735 * $ sleep 3
1736 * $ echo filfre >nitfol
1737 * $ git-update-index --add nitfol
1738 *
Junio C Hamanob7e58b12006-08-05 04:16:02 -07001739 * but it does not. When the second update-index runs,
Junio C Hamano4b3511b2005-12-20 14:18:47 -08001740 * it notices that the entry "frotz" has the same timestamp
1741 * as index, and if we were to smudge it by resetting its
1742 * size to zero here, then the object name recorded
1743 * in index is the 6-byte file but the cached stat information
1744 * becomes zero --- which would then match what we would
Junio C Hamanoa6080a02007-06-07 00:04:01 -07001745 * obtain from the filesystem next time we stat("frotz").
Junio C Hamano4b3511b2005-12-20 14:18:47 -08001746 *
1747 * However, the second update-index, before calling
1748 * this function, notices that the cached size is 6
1749 * bytes and what is on the filesystem is an empty
1750 * file, and never calls us, so the cached size information
1751 * for "frotz" stays 6 which does not match the filesystem.
1752 */
Michael Haggertyc21d39d2013-06-20 10:37:50 +02001753 ce->ce_stat_data.sd_size = 0;
Junio C Hamano407c8eb2005-12-20 12:12:18 -08001754 }
1755}
1756
Junio C Hamanof136f7b2012-04-03 15:53:14 -07001757/* Copy miscellaneous fields but not the name */
1758static char *copy_cache_entry_to_ondisk(struct ondisk_cache_entry *ondisk,
1759 struct cache_entry *ce)
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001760{
Thomas Gummererb60e1882012-07-11 11:22:37 +02001761 short flags;
1762
Michael Haggertyc21d39d2013-06-20 10:37:50 +02001763 ondisk->ctime.sec = htonl(ce->ce_stat_data.sd_ctime.sec);
1764 ondisk->mtime.sec = htonl(ce->ce_stat_data.sd_mtime.sec);
1765 ondisk->ctime.nsec = htonl(ce->ce_stat_data.sd_ctime.nsec);
1766 ondisk->mtime.nsec = htonl(ce->ce_stat_data.sd_mtime.nsec);
1767 ondisk->dev = htonl(ce->ce_stat_data.sd_dev);
1768 ondisk->ino = htonl(ce->ce_stat_data.sd_ino);
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001769 ondisk->mode = htonl(ce->ce_mode);
Michael Haggertyc21d39d2013-06-20 10:37:50 +02001770 ondisk->uid = htonl(ce->ce_stat_data.sd_uid);
1771 ondisk->gid = htonl(ce->ce_stat_data.sd_gid);
1772 ondisk->size = htonl(ce->ce_stat_data.sd_size);
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001773 hashcpy(ondisk->sha1, ce->sha1);
Thomas Gummererb60e1882012-07-11 11:22:37 +02001774
Nguyễn Thái Ngọc Duyce51bf02014-06-13 19:19:25 +07001775 flags = ce->ce_flags & ~CE_NAMEMASK;
Thomas Gummererb60e1882012-07-11 11:22:37 +02001776 flags |= (ce_namelen(ce) >= CE_NAMEMASK ? CE_NAMEMASK : ce_namelen(ce));
1777 ondisk->flags = htons(flags);
Nguyễn Thái Ngọc Duy06aaaa02008-10-01 11:04:01 +07001778 if (ce->ce_flags & CE_EXTENDED) {
1779 struct ondisk_cache_entry_extended *ondisk2;
1780 ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;
1781 ondisk2->flags2 = htons((ce->ce_flags & CE_EXTENDED_FLAGS) >> 16);
Junio C Hamanof136f7b2012-04-03 15:53:14 -07001782 return ondisk2->name;
Nguyễn Thái Ngọc Duy06aaaa02008-10-01 11:04:01 +07001783 }
Junio C Hamanof136f7b2012-04-03 15:53:14 -07001784 else {
1785 return ondisk->name;
1786 }
1787}
1788
Junio C Hamano9d227782012-04-04 09:12:43 -07001789static int ce_write_entry(git_SHA_CTX *c, int fd, struct cache_entry *ce,
1790 struct strbuf *previous_name)
Junio C Hamanof136f7b2012-04-03 15:53:14 -07001791{
Junio C Hamano9d227782012-04-04 09:12:43 -07001792 int size;
1793 struct ondisk_cache_entry *ondisk;
Nguyễn Thái Ngọc Duyb3c96fb2014-06-13 19:19:43 +07001794 int saved_namelen = saved_namelen; /* compiler workaround */
Junio C Hamanof136f7b2012-04-03 15:53:14 -07001795 char *name;
1796 int result;
1797
Nguyễn Thái Ngọc Duyb3c96fb2014-06-13 19:19:43 +07001798 if (ce->ce_flags & CE_STRIP_NAME) {
1799 saved_namelen = ce_namelen(ce);
1800 ce->ce_namelen = 0;
1801 }
1802
Junio C Hamano9d227782012-04-04 09:12:43 -07001803 if (!previous_name) {
1804 size = ondisk_ce_size(ce);
1805 ondisk = xcalloc(1, size);
1806 name = copy_cache_entry_to_ondisk(ondisk, ce);
1807 memcpy(name, ce->name, ce_namelen(ce));
1808 } else {
1809 int common, to_remove, prefix_size;
1810 unsigned char to_remove_vi[16];
1811 for (common = 0;
1812 (ce->name[common] &&
1813 common < previous_name->len &&
1814 ce->name[common] == previous_name->buf[common]);
1815 common++)
1816 ; /* still matching */
1817 to_remove = previous_name->len - common;
1818 prefix_size = encode_varint(to_remove, to_remove_vi);
1819
1820 if (ce->ce_flags & CE_EXTENDED)
1821 size = offsetof(struct ondisk_cache_entry_extended, name);
1822 else
1823 size = offsetof(struct ondisk_cache_entry, name);
1824 size += prefix_size + (ce_namelen(ce) - common + 1);
1825
1826 ondisk = xcalloc(1, size);
1827 name = copy_cache_entry_to_ondisk(ondisk, ce);
1828 memcpy(name, to_remove_vi, prefix_size);
1829 memcpy(name + prefix_size, ce->name + common, ce_namelen(ce) - common);
1830
1831 strbuf_splice(previous_name, common, to_remove,
1832 ce->name + common, ce_namelen(ce) - common);
1833 }
Nguyễn Thái Ngọc Duyb3c96fb2014-06-13 19:19:43 +07001834 if (ce->ce_flags & CE_STRIP_NAME) {
1835 ce->ce_namelen = saved_namelen;
1836 ce->ce_flags &= ~CE_STRIP_NAME;
1837 }
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001838
Jonathan Nieder59efba62010-08-09 22:28:07 -05001839 result = ce_write(c, fd, ondisk, size);
1840 free(ondisk);
1841 return result;
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001842}
1843
Yiannis Marangos426ddee2014-04-10 21:31:21 +03001844/*
1845 * This function verifies if index_state has the correct sha1 of the
1846 * index file. Don't die if we have any other failure, just return 0.
1847 */
1848static int verify_index_from(const struct index_state *istate, const char *path)
1849{
1850 int fd;
1851 ssize_t n;
1852 struct stat st;
1853 unsigned char sha1[20];
1854
1855 if (!istate->initialized)
1856 return 0;
1857
1858 fd = open(path, O_RDONLY);
1859 if (fd < 0)
1860 return 0;
1861
1862 if (fstat(fd, &st))
1863 goto out;
1864
1865 if (st.st_size < sizeof(struct cache_header) + 20)
1866 goto out;
1867
1868 n = pread_in_full(fd, sha1, 20, st.st_size - 20);
1869 if (n != 20)
1870 goto out;
1871
1872 if (hashcmp(istate->sha1, sha1))
1873 goto out;
1874
1875 close(fd);
1876 return 1;
1877
1878out:
1879 close(fd);
1880 return 0;
1881}
1882
1883static int verify_index(const struct index_state *istate)
1884{
1885 return verify_index_from(istate, get_index_file());
1886}
1887
Junio C Hamano483fbe22011-03-21 10:18:19 -07001888static int has_racy_timestamp(struct index_state *istate)
1889{
1890 int entries = istate->cache_nr;
1891 int i;
1892
1893 for (i = 0; i < entries; i++) {
1894 struct cache_entry *ce = istate->cache[i];
1895 if (is_racy_timestamp(istate, ce))
1896 return 1;
1897 }
1898 return 0;
1899}
1900
Junio C Hamanoccdc4ec2011-03-21 10:16:10 -07001901/*
Ondřej Bílka98e023d2013-07-29 10:18:21 +02001902 * Opportunistically update the index but do not complain if we can't
Junio C Hamanoccdc4ec2011-03-21 10:16:10 -07001903 */
1904void update_index_if_able(struct index_state *istate, struct lock_file *lockfile)
1905{
Junio C Hamano483fbe22011-03-21 10:18:19 -07001906 if ((istate->cache_changed || has_racy_timestamp(istate)) &&
Junio C Hamano788cef82014-07-16 11:25:40 -07001907 verify_index(istate) &&
Nguyễn Thái Ngọc Duy03b86642014-06-13 19:19:23 +07001908 write_locked_index(istate, lockfile, COMMIT_LOCK))
Junio C Hamanoccdc4ec2011-03-21 10:16:10 -07001909 rollback_lock_file(lockfile);
1910}
1911
Nguyễn Thái Ngọc Duyc18b80a2014-06-13 19:19:44 +07001912static int do_write_index(struct index_state *istate, int newfd,
1913 int strip_extensions)
Linus Torvalds197ee8c2005-04-09 12:09:27 -07001914{
Nicolas Pitre9126f002008-10-01 14:05:20 -04001915 git_SHA_CTX c;
Linus Torvalds197ee8c2005-04-09 12:09:27 -07001916 struct cache_header hdr;
Junio C Hamano9d227782012-04-04 09:12:43 -07001917 int i, err, removed, extended, hdr_version;
Junio C Hamano4aab5b42007-04-01 23:26:07 -07001918 struct cache_entry **cache = istate->cache;
1919 int entries = istate->cache_nr;
Kjetil Barvike1afca42009-02-23 19:02:57 +01001920 struct stat st;
Junio C Hamano9d227782012-04-04 09:12:43 -07001921 struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;
Junio C Hamano025a0702005-06-10 01:32:37 -07001922
Nguyễn Thái Ngọc Duy06aaaa02008-10-01 11:04:01 +07001923 for (i = removed = extended = 0; i < entries; i++) {
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001924 if (cache[i]->ce_flags & CE_REMOVE)
Junio C Hamano025a0702005-06-10 01:32:37 -07001925 removed++;
Linus Torvalds197ee8c2005-04-09 12:09:27 -07001926
Nguyễn Thái Ngọc Duy06aaaa02008-10-01 11:04:01 +07001927 /* reduce extended entries if possible */
1928 cache[i]->ce_flags &= ~CE_EXTENDED;
1929 if (cache[i]->ce_flags & CE_EXTENDED_FLAGS) {
1930 extended++;
1931 cache[i]->ce_flags |= CE_EXTENDED;
1932 }
1933 }
1934
Nguyễn Thái Ngọc Duyd6e3c182014-06-13 19:19:49 +07001935 if (!istate->version) {
Thomas Gummerer136347d2014-02-23 21:49:57 +01001936 istate->version = get_index_format_default();
Nguyễn Thái Ngọc Duyd6e3c182014-06-13 19:19:49 +07001937 if (getenv("GIT_TEST_SPLIT_INDEX"))
1938 init_split_index(istate);
1939 }
Junio C Hamano9d227782012-04-04 09:12:43 -07001940
1941 /* demote version 3 to version 2 when the latter suffices */
1942 if (istate->version == 3 || istate->version == 2)
1943 istate->version = extended ? 3 : 2;
1944
1945 hdr_version = istate->version;
1946
Linus Torvaldsccc4feb2005-04-15 10:44:27 -07001947 hdr.hdr_signature = htonl(CACHE_SIGNATURE);
Junio C Hamano9d227782012-04-04 09:12:43 -07001948 hdr.hdr_version = htonl(hdr_version);
Junio C Hamano025a0702005-06-10 01:32:37 -07001949 hdr.hdr_entries = htonl(entries - removed);
Linus Torvalds197ee8c2005-04-09 12:09:27 -07001950
Nicolas Pitre9126f002008-10-01 14:05:20 -04001951 git_SHA1_Init(&c);
Linus Torvaldsca9be052005-04-20 12:36:41 -07001952 if (ce_write(&c, newfd, &hdr, sizeof(hdr)) < 0)
Linus Torvalds197ee8c2005-04-09 12:09:27 -07001953 return -1;
1954
Junio C Hamano9d227782012-04-04 09:12:43 -07001955 previous_name = (hdr_version == 4) ? &previous_name_buf : NULL;
Linus Torvalds197ee8c2005-04-09 12:09:27 -07001956 for (i = 0; i < entries; i++) {
1957 struct cache_entry *ce = cache[i];
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001958 if (ce->ce_flags & CE_REMOVE)
Linus Torvaldsaa160212005-06-09 15:34:04 -07001959 continue;
Junio C Hamanoe06c43c2008-03-30 09:25:52 -07001960 if (!ce_uptodate(ce) && is_racy_timestamp(istate, ce))
Junio C Hamano407c8eb2005-12-20 12:12:18 -08001961 ce_smudge_racily_clean_entry(ce);
Jeff King83bd7432013-08-27 16:41:12 -04001962 if (is_null_sha1(ce->sha1)) {
1963 static const char msg[] = "cache entry has null sha1: %s";
1964 static int allow = -1;
1965
1966 if (allow < 0)
1967 allow = git_env_bool("GIT_ALLOW_NULL_SHA1", 0);
1968 if (allow)
1969 warning(msg, ce->name);
1970 else
1971 return error(msg, ce->name);
1972 }
Junio C Hamano9d227782012-04-04 09:12:43 -07001973 if (ce_write_entry(&c, newfd, ce, previous_name) < 0)
Linus Torvalds197ee8c2005-04-09 12:09:27 -07001974 return -1;
1975 }
Junio C Hamano9d227782012-04-04 09:12:43 -07001976 strbuf_release(&previous_name_buf);
Junio C Hamano1af1c2b2006-04-23 16:52:08 -07001977
Junio C Hamanobad68ec2006-04-24 21:18:58 -07001978 /* Write extension data here */
Nguyễn Thái Ngọc Duyc18b80a2014-06-13 19:19:44 +07001979 if (!strip_extensions && istate->split_index) {
Nguyễn Thái Ngọc Duy5fc2fc82014-06-13 19:19:36 +07001980 struct strbuf sb = STRBUF_INIT;
1981
1982 err = write_link_extension(&sb, istate) < 0 ||
1983 write_index_ext_header(&c, newfd, CACHE_EXT_LINK,
1984 sb.len) < 0 ||
1985 ce_write(&c, newfd, sb.buf, sb.len) < 0;
1986 strbuf_release(&sb);
1987 if (err)
1988 return -1;
1989 }
Nguyễn Thái Ngọc Duyc18b80a2014-06-13 19:19:44 +07001990 if (!strip_extensions && istate->cache_tree) {
Brandon Caseyf285a2d2008-10-09 14:12:12 -05001991 struct strbuf sb = STRBUF_INIT;
Pierre Habouzit1dffb8f2007-09-25 10:22:44 +02001992
Pierre Habouzit1dffb8f2007-09-25 10:22:44 +02001993 cache_tree_write(&sb, istate->cache_tree);
1994 err = write_index_ext_header(&c, newfd, CACHE_EXT_TREE, sb.len) < 0
1995 || ce_write(&c, newfd, sb.buf, sb.len) < 0;
1996 strbuf_release(&sb);
1997 if (err)
Junio C Hamanobad68ec2006-04-24 21:18:58 -07001998 return -1;
Junio C Hamanobad68ec2006-04-24 21:18:58 -07001999 }
Nguyễn Thái Ngọc Duyc18b80a2014-06-13 19:19:44 +07002000 if (!strip_extensions && istate->resolve_undo) {
Junio C Hamanocfc57892009-12-25 00:30:51 -08002001 struct strbuf sb = STRBUF_INIT;
2002
2003 resolve_undo_write(&sb, istate->resolve_undo);
2004 err = write_index_ext_header(&c, newfd, CACHE_EXT_RESOLVE_UNDO,
2005 sb.len) < 0
2006 || ce_write(&c, newfd, sb.buf, sb.len) < 0;
2007 strbuf_release(&sb);
2008 if (err)
2009 return -1;
2010 }
Kjetil Barvike1afca42009-02-23 19:02:57 +01002011
Nguyễn Thái Ngọc Duye93021b2014-06-13 19:19:35 +07002012 if (ce_flush(&c, newfd, istate->sha1) || fstat(newfd, &st))
Kjetil Barvike1afca42009-02-23 19:02:57 +01002013 return -1;
Kjetil Barvik5bcf1092009-03-15 12:38:55 +01002014 istate->timestamp.sec = (unsigned int)st.st_mtime;
2015 istate->timestamp.nsec = ST_MTIME_NSEC(st);
Kjetil Barvike1afca42009-02-23 19:02:57 +01002016 return 0;
Linus Torvalds197ee8c2005-04-09 12:09:27 -07002017}
Miklos Vajnae46bbcf2008-06-27 18:21:58 +02002018
Nguyễn Thái Ngọc Duy626f35c2014-06-13 19:19:24 +07002019void set_alternate_index_output(const char *name)
2020{
2021 alternate_index_output = name;
2022}
2023
2024static int commit_locked_index(struct lock_file *lk)
2025{
2026 if (alternate_index_output) {
2027 if (lk->fd >= 0 && close_lock_file(lk))
2028 return -1;
2029 if (rename(lk->filename, alternate_index_output))
2030 return -1;
2031 lk->filename[0] = 0;
2032 return 0;
2033 } else {
2034 return commit_lock_file(lk);
2035 }
2036}
2037
Nguyễn Thái Ngọc Duy03b86642014-06-13 19:19:23 +07002038static int do_write_locked_index(struct index_state *istate, struct lock_file *lock,
2039 unsigned flags)
2040{
Nguyễn Thái Ngọc Duyc18b80a2014-06-13 19:19:44 +07002041 int ret = do_write_index(istate, lock->fd, 0);
Nguyễn Thái Ngọc Duy03b86642014-06-13 19:19:23 +07002042 if (ret)
2043 return ret;
2044 assert((flags & (COMMIT_LOCK | CLOSE_LOCK)) !=
2045 (COMMIT_LOCK | CLOSE_LOCK));
2046 if (flags & COMMIT_LOCK)
2047 return commit_locked_index(lock);
2048 else if (flags & CLOSE_LOCK)
2049 return close_lock_file(lock);
2050 else
2051 return ret;
2052}
2053
Nguyễn Thái Ngọc Duy5fc2fc82014-06-13 19:19:36 +07002054static int write_split_index(struct index_state *istate,
2055 struct lock_file *lock,
2056 unsigned flags)
2057{
2058 int ret;
2059 prepare_to_write_split_index(istate);
2060 ret = do_write_locked_index(istate, lock, flags);
2061 finish_writing_split_index(istate);
2062 return ret;
2063}
2064
Nguyễn Thái Ngọc Duyc18b80a2014-06-13 19:19:44 +07002065static char *temporary_sharedindex;
2066
2067static void remove_temporary_sharedindex(void)
2068{
2069 if (temporary_sharedindex) {
2070 unlink_or_warn(temporary_sharedindex);
2071 free(temporary_sharedindex);
2072 temporary_sharedindex = NULL;
2073 }
2074}
2075
2076static void remove_temporary_sharedindex_on_signal(int signo)
2077{
2078 remove_temporary_sharedindex();
2079 sigchain_pop(signo);
2080 raise(signo);
2081}
2082
Nguyễn Thái Ngọc Duya0a96752014-06-13 19:19:45 +07002083static int write_shared_index(struct index_state *istate,
2084 struct lock_file *lock, unsigned flags)
Nguyễn Thái Ngọc Duyc18b80a2014-06-13 19:19:44 +07002085{
2086 struct split_index *si = istate->split_index;
2087 static int installed_handler;
2088 int fd, ret;
2089
2090 temporary_sharedindex = git_pathdup("sharedindex_XXXXXX");
Nguyễn Thái Ngọc Duya0a96752014-06-13 19:19:45 +07002091 fd = mkstemp(temporary_sharedindex);
2092 if (fd < 0) {
2093 free(temporary_sharedindex);
2094 temporary_sharedindex = NULL;
2095 hashclr(si->base_sha1);
2096 return do_write_locked_index(istate, lock, flags);
2097 }
Nguyễn Thái Ngọc Duyc18b80a2014-06-13 19:19:44 +07002098 if (!installed_handler) {
2099 atexit(remove_temporary_sharedindex);
2100 sigchain_push_common(remove_temporary_sharedindex_on_signal);
2101 }
2102 move_cache_to_base_index(istate);
2103 ret = do_write_index(si->base, fd, 1);
2104 close(fd);
2105 if (ret) {
2106 remove_temporary_sharedindex();
2107 return ret;
2108 }
2109 ret = rename(temporary_sharedindex,
2110 git_path("sharedindex.%s", sha1_to_hex(si->base->sha1)));
2111 free(temporary_sharedindex);
2112 temporary_sharedindex = NULL;
2113 if (!ret)
2114 hashcpy(si->base_sha1, si->base->sha1);
2115 return ret;
2116}
2117
Nguyễn Thái Ngọc Duy03b86642014-06-13 19:19:23 +07002118int write_locked_index(struct index_state *istate, struct lock_file *lock,
2119 unsigned flags)
2120{
Nguyễn Thái Ngọc Duy5fc2fc82014-06-13 19:19:36 +07002121 struct split_index *si = istate->split_index;
2122
Nguyễn Thái Ngọc Duy5165dd52014-06-13 19:19:47 +07002123 if (!si || alternate_index_output ||
2124 (istate->cache_changed & ~EXTMASK)) {
Nguyễn Thái Ngọc Duy5fc2fc82014-06-13 19:19:36 +07002125 if (si)
2126 hashclr(si->base_sha1);
2127 return do_write_locked_index(istate, lock, flags);
2128 }
2129
Nguyễn Thái Ngọc Duyd6e3c182014-06-13 19:19:49 +07002130 if (getenv("GIT_TEST_SPLIT_INDEX")) {
2131 int v = si->base_sha1[0];
2132 if ((v & 15) < 6)
2133 istate->cache_changed |= SPLIT_INDEX_ORDERED;
2134 }
Nguyễn Thái Ngọc Duyc18b80a2014-06-13 19:19:44 +07002135 if (istate->cache_changed & SPLIT_INDEX_ORDERED) {
Nguyễn Thái Ngọc Duya0a96752014-06-13 19:19:45 +07002136 int ret = write_shared_index(istate, lock, flags);
Nguyễn Thái Ngọc Duyc18b80a2014-06-13 19:19:44 +07002137 if (ret)
2138 return ret;
2139 }
2140
Nguyễn Thái Ngọc Duy5fc2fc82014-06-13 19:19:36 +07002141 return write_split_index(istate, lock, flags);
Nguyễn Thái Ngọc Duy03b86642014-06-13 19:19:23 +07002142}
2143
Miklos Vajnae46bbcf2008-06-27 18:21:58 +02002144/*
2145 * Read the index file that is potentially unmerged into given
Junio C Hamano63e8dc52008-12-05 17:54:11 -08002146 * index_state, dropping any unmerged entries. Returns true if
Miklos Vajnae46bbcf2008-06-27 18:21:58 +02002147 * the index is unmerged. Callers who want to refuse to work
2148 * from an unmerged state can call this and check its return value,
2149 * instead of calling read_cache().
2150 */
2151int read_index_unmerged(struct index_state *istate)
2152{
2153 int i;
Junio C Hamanod1a43f22008-10-15 16:00:06 -07002154 int unmerged = 0;
Miklos Vajnae46bbcf2008-06-27 18:21:58 +02002155
2156 read_index(istate);
Miklos Vajnae46bbcf2008-06-27 18:21:58 +02002157 for (i = 0; i < istate->cache_nr; i++) {
2158 struct cache_entry *ce = istate->cache[i];
Junio C Hamanod1a43f22008-10-15 16:00:06 -07002159 struct cache_entry *new_ce;
2160 int size, len;
2161
2162 if (!ce_stage(ce))
Miklos Vajnae46bbcf2008-06-27 18:21:58 +02002163 continue;
Junio C Hamanod1a43f22008-10-15 16:00:06 -07002164 unmerged = 1;
Thomas Gummerer68c4f6a2012-07-06 18:07:30 +02002165 len = ce_namelen(ce);
Junio C Hamanod1a43f22008-10-15 16:00:06 -07002166 size = cache_entry_size(len);
2167 new_ce = xcalloc(1, size);
Junio C Hamanod1a43f22008-10-15 16:00:06 -07002168 memcpy(new_ce->name, ce->name, len);
Thomas Gummererb60e1882012-07-11 11:22:37 +02002169 new_ce->ce_flags = create_ce_flags(0) | CE_CONFLICTED;
2170 new_ce->ce_namelen = len;
Junio C Hamanod1a43f22008-10-15 16:00:06 -07002171 new_ce->ce_mode = ce->ce_mode;
2172 if (add_index_entry(istate, new_ce, 0))
2173 return error("%s: cannot drop to stage #0",
Karsten Blees5699d172013-11-14 20:24:37 +01002174 new_ce->name);
Junio C Hamanod1a43f22008-10-15 16:00:06 -07002175 i = index_name_pos(istate, new_ce->name, len);
Miklos Vajnae46bbcf2008-06-27 18:21:58 +02002176 }
Junio C Hamanod1a43f22008-10-15 16:00:06 -07002177 return unmerged;
Miklos Vajnae46bbcf2008-06-27 18:21:58 +02002178}
Junio C Hamano041aee32008-07-21 01:24:17 -07002179
Jeff King98fa4732008-10-16 11:07:26 -04002180/*
2181 * Returns 1 if the path is an "other" path with respect to
2182 * the index; that is, the path is not mentioned in the index at all,
2183 * either as a file, a directory with some files in the index,
2184 * or as an unmerged entry.
2185 *
2186 * We helpfully remove a trailing "/" from directories so that
2187 * the output of read_directory can be used as-is.
2188 */
2189int index_name_is_other(const struct index_state *istate, const char *name,
2190 int namelen)
2191{
2192 int pos;
2193 if (namelen && name[namelen - 1] == '/')
2194 namelen--;
2195 pos = index_name_pos(istate, name, namelen);
2196 if (0 <= pos)
2197 return 0; /* exact match */
2198 pos = -pos - 1;
2199 if (pos < istate->cache_nr) {
2200 struct cache_entry *ce = istate->cache[pos];
2201 if (ce_namelen(ce) == namelen &&
2202 !memcmp(ce->name, name, namelen))
2203 return 0; /* Yup, this one exists unmerged */
2204 }
2205 return 1;
2206}
Lukas Fleischer29fb37b2013-04-13 15:28:30 +02002207
Lukas Fleischerff366822013-04-13 15:28:31 +02002208void *read_blob_data_from_index(struct index_state *istate, const char *path, unsigned long *size)
Lukas Fleischer29fb37b2013-04-13 15:28:30 +02002209{
2210 int pos, len;
2211 unsigned long sz;
2212 enum object_type type;
2213 void *data;
2214
2215 len = strlen(path);
2216 pos = index_name_pos(istate, path, len);
2217 if (pos < 0) {
2218 /*
2219 * We might be in the middle of a merge, in which
2220 * case we would read stage #2 (ours).
2221 */
2222 int i;
2223 for (i = -pos - 1;
2224 (pos < 0 && i < istate->cache_nr &&
2225 !strcmp(istate->cache[i]->name, path));
2226 i++)
2227 if (ce_stage(istate->cache[i]) == 2)
2228 pos = i;
2229 }
2230 if (pos < 0)
2231 return NULL;
2232 data = read_sha1_file(istate->cache[pos]->sha1, &type, &sz);
2233 if (!data || type != OBJ_BLOB) {
2234 free(data);
2235 return NULL;
2236 }
Lukas Fleischerff366822013-04-13 15:28:31 +02002237 if (size)
2238 *size = sz;
Lukas Fleischer29fb37b2013-04-13 15:28:30 +02002239 return data;
2240}
Michael Haggerty38612532013-06-20 10:37:51 +02002241
2242void stat_validity_clear(struct stat_validity *sv)
2243{
2244 free(sv->sd);
2245 sv->sd = NULL;
2246}
2247
2248int stat_validity_check(struct stat_validity *sv, const char *path)
2249{
2250 struct stat st;
2251
2252 if (stat(path, &st) < 0)
2253 return sv->sd == NULL;
2254 if (!sv->sd)
2255 return 0;
2256 return S_ISREG(st.st_mode) && !match_stat_data(sv->sd, &st);
2257}
2258
2259void stat_validity_update(struct stat_validity *sv, int fd)
2260{
2261 struct stat st;
2262
2263 if (fstat(fd, &st) < 0 || !S_ISREG(st.st_mode))
2264 stat_validity_clear(sv);
2265 else {
2266 if (!sv->sd)
2267 sv->sd = xcalloc(1, sizeof(struct stat_data));
2268 fill_stat_data(sv->sd, &st);
2269 }
2270}