blob: a51bba1b9569d64c348f3affc90ed8640e0e0189 [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 Hamanobad68ec2006-04-24 21:18:58 -070015
Junio C Hamano87b29e52010-01-11 22:29:35 -080016static struct cache_entry *refresh_cache_entry(struct cache_entry *ce, int really);
17
Junio C Hamanobad68ec2006-04-24 21:18:58 -070018/* Index extensions.
19 *
20 * The first letter should be 'A'..'Z' for extensions that are not
21 * necessary for a correct operation (i.e. optimization data).
22 * When new extensions are added that _needs_ to be understood in
23 * order to correctly interpret the index file, pick character that
24 * is outside the range, to cause the reader to abort.
25 */
26
27#define CACHE_EXT(s) ( (s[0]<<24)|(s[1]<<16)|(s[2]<<8)|(s[3]) )
28#define CACHE_EXT_TREE 0x54524545 /* "TREE" */
Shawn O. Pearceb659b492010-02-02 07:33:28 -080029#define CACHE_EXT_RESOLVE_UNDO 0x52455543 /* "REUC" */
Linus Torvaldse83c5162005-04-07 15:13:13 -070030
Junio C Hamano228e94f2007-04-01 18:14:06 -070031struct index_state the_index;
Johannes Schindelin8fd2cb42006-07-25 21:32:18 -070032
Junio C Hamano9cb76b82008-01-22 23:01:13 -080033static void set_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
34{
35 istate->cache[nr] = ce;
Linus Torvalds96872bc2008-03-21 13:16:24 -070036 add_name_hash(istate, ce);
Junio C Hamano9cb76b82008-01-22 23:01:13 -080037}
38
Linus Torvaldscf558702008-01-22 18:41:14 -080039static void replace_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
40{
41 struct cache_entry *old = istate->cache[nr];
42
Linus Torvalds96872bc2008-03-21 13:16:24 -070043 remove_name_hash(old);
Linus Torvaldsa22c6372008-02-22 20:37:40 -080044 set_index_entry(istate, nr, ce);
Linus Torvaldscf558702008-01-22 18:41:14 -080045 istate->cache_changed = 1;
46}
47
Petr Baudis81dc2302008-07-21 02:25:56 +020048void rename_index_entry_at(struct index_state *istate, int nr, const char *new_name)
49{
50 struct cache_entry *old = istate->cache[nr], *new;
51 int namelen = strlen(new_name);
52
53 new = xmalloc(cache_entry_size(namelen));
54 copy_cache_entry(new, old);
55 new->ce_flags &= ~(CE_STATE_MASK | CE_NAMEMASK);
56 new->ce_flags |= (namelen >= CE_NAMEMASK ? CE_NAMEMASK : namelen);
57 memcpy(new->name, new_name, namelen + 1);
58
59 cache_tree_invalidate_path(istate->cache_tree, old->name);
60 remove_index_entry_at(istate, nr);
61 add_index_entry(istate, new, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
62}
63
Junio C Hamano415e96c2005-05-15 14:23:12 -070064/*
65 * This only updates the "non-critical" parts of the directory
66 * cache, ie the parts that aren't tracked by GIT, and only used
67 * to validate the cache.
68 */
69void fill_stat_cache_info(struct cache_entry *ce, struct stat *st)
70{
Kjetil Barvikfba2f382009-02-19 21:08:29 +010071 ce->ce_ctime.sec = (unsigned int)st->st_ctime;
72 ce->ce_mtime.sec = (unsigned int)st->st_mtime;
Kjetil Barvikc06ff492009-03-04 18:47:40 +010073 ce->ce_ctime.nsec = ST_CTIME_NSEC(*st);
74 ce->ce_mtime.nsec = ST_MTIME_NSEC(*st);
Linus Torvalds7a51ed62008-01-14 16:03:17 -080075 ce->ce_dev = st->st_dev;
76 ce->ce_ino = st->st_ino;
77 ce->ce_uid = st->st_uid;
78 ce->ce_gid = st->st_gid;
79 ce->ce_size = st->st_size;
Junio C Hamano5f730762006-02-08 21:15:24 -080080
81 if (assume_unchanged)
Linus Torvalds7a51ed62008-01-14 16:03:17 -080082 ce->ce_flags |= CE_VALID;
Junio C Hamanoeadb5832008-01-18 23:45:24 -080083
84 if (S_ISREG(st->st_mode))
85 ce_mark_uptodate(ce);
Junio C Hamano415e96c2005-05-15 14:23:12 -070086}
87
Junio C Hamano29e4d362005-12-20 00:02:15 -080088static int ce_compare_data(struct cache_entry *ce, struct stat *st)
89{
90 int match = -1;
91 int fd = open(ce->name, O_RDONLY);
92
93 if (fd >= 0) {
94 unsigned char sha1[20];
Junio C Hamanoc4ce46f2011-05-08 01:47:33 -070095 if (!index_fd(sha1, fd, st, OBJ_BLOB, ce->name, 0))
David Rientjesa89fccd2006-08-17 11:54:57 -070096 match = hashcmp(sha1, ce->sha1);
Linus Torvalds7f8508e2006-07-31 09:55:15 -070097 /* index_fd() closed the file descriptor already */
Junio C Hamano29e4d362005-12-20 00:02:15 -080098 }
99 return match;
100}
101
Shawn O. Pearcedc49cd72007-03-06 20:44:37 -0500102static int ce_compare_link(struct cache_entry *ce, size_t expected_size)
Junio C Hamano29e4d362005-12-20 00:02:15 -0800103{
104 int match = -1;
Junio C Hamano29e4d362005-12-20 00:02:15 -0800105 void *buffer;
106 unsigned long size;
Nicolas Pitre21666f12007-02-26 14:55:59 -0500107 enum object_type type;
Linus Torvaldsa60272b2008-12-17 09:47:27 -0800108 struct strbuf sb = STRBUF_INIT;
Junio C Hamano29e4d362005-12-20 00:02:15 -0800109
Linus Torvaldsa60272b2008-12-17 09:47:27 -0800110 if (strbuf_readlink(&sb, ce->name, expected_size))
Junio C Hamano29e4d362005-12-20 00:02:15 -0800111 return -1;
Linus Torvaldsa60272b2008-12-17 09:47:27 -0800112
Nicolas Pitre21666f12007-02-26 14:55:59 -0500113 buffer = read_sha1_file(ce->sha1, &type, &size);
Linus Torvaldsa60272b2008-12-17 09:47:27 -0800114 if (buffer) {
115 if (size == sb.len)
116 match = memcmp(buffer, sb.buf, size);
117 free(buffer);
Junio C Hamano29e4d362005-12-20 00:02:15 -0800118 }
Linus Torvaldsa60272b2008-12-17 09:47:27 -0800119 strbuf_release(&sb);
Junio C Hamano29e4d362005-12-20 00:02:15 -0800120 return match;
121}
122
Linus Torvaldsf35a6d32007-04-09 21:20:29 -0700123static int ce_compare_gitlink(struct cache_entry *ce)
124{
125 unsigned char sha1[20];
126
127 /*
128 * We don't actually require that the .git directory
Martin Waitz302b9282007-05-21 22:08:28 +0200129 * under GITLINK directory be a valid git directory. It
Linus Torvaldsf35a6d32007-04-09 21:20:29 -0700130 * might even be missing (in case nobody populated that
131 * sub-project).
132 *
133 * If so, we consider it always to match.
134 */
135 if (resolve_gitlink_ref(ce->name, "HEAD", sha1) < 0)
136 return 0;
137 return hashcmp(sha1, ce->sha1);
138}
139
Junio C Hamano29e4d362005-12-20 00:02:15 -0800140static int ce_modified_check_fs(struct cache_entry *ce, struct stat *st)
141{
142 switch (st->st_mode & S_IFMT) {
143 case S_IFREG:
144 if (ce_compare_data(ce, st))
145 return DATA_CHANGED;
146 break;
147 case S_IFLNK:
Shawn O. Pearcedc49cd72007-03-06 20:44:37 -0500148 if (ce_compare_link(ce, xsize_t(st->st_size)))
Junio C Hamano29e4d362005-12-20 00:02:15 -0800149 return DATA_CHANGED;
150 break;
Linus Torvaldsa8ee75b2007-04-13 09:24:13 -0700151 case S_IFDIR:
Linus Torvalds7a51ed62008-01-14 16:03:17 -0800152 if (S_ISGITLINK(ce->ce_mode))
Junio C Hamanoc70115b2008-07-29 01:13:44 -0700153 return ce_compare_gitlink(ce) ? DATA_CHANGED : 0;
Junio C Hamano29e4d362005-12-20 00:02:15 -0800154 default:
155 return TYPE_CHANGED;
156 }
157 return 0;
158}
159
Junio C Hamano87b29e52010-01-11 22:29:35 -0800160static int is_empty_blob_sha1(const unsigned char *sha1)
Linus Torvaldsf49c2c22008-06-10 10:44:43 -0700161{
162 static const unsigned char empty_blob_sha1[20] = {
163 0xe6,0x9d,0xe2,0x9b,0xb2,0xd1,0xd6,0x43,0x4b,0x8b,
164 0x29,0xae,0x77,0x5a,0xd8,0xc2,0xe4,0x8c,0x53,0x91
165 };
166
167 return !hashcmp(sha1, empty_blob_sha1);
168}
169
Junio C Hamano407c8eb2005-12-20 12:12:18 -0800170static int ce_match_stat_basic(struct cache_entry *ce, struct stat *st)
Linus Torvalds734aab72005-04-09 09:48:20 -0700171{
172 unsigned int changed = 0;
173
Linus Torvalds7a51ed62008-01-14 16:03:17 -0800174 if (ce->ce_flags & CE_REMOVE)
175 return MODE_CHANGED | DATA_CHANGED | TYPE_CHANGED;
176
177 switch (ce->ce_mode & S_IFMT) {
Kay Sievers8ae0a8c2005-05-05 14:38:25 +0200178 case S_IFREG:
179 changed |= !S_ISREG(st->st_mode) ? TYPE_CHANGED : 0;
Junio C Hamano3e09cdf2005-10-11 18:45:33 -0700180 /* We consider only the owner x bit to be relevant for
181 * "mode changes"
182 */
183 if (trust_executable_bit &&
Linus Torvalds7a51ed62008-01-14 16:03:17 -0800184 (0100 & (ce->ce_mode ^ st->st_mode)))
Kay Sieversffbe1ad2005-05-06 15:45:01 +0200185 changed |= MODE_CHANGED;
Kay Sievers8ae0a8c2005-05-05 14:38:25 +0200186 break;
187 case S_IFLNK:
Johannes Sixt78a8d642007-03-02 22:11:30 +0100188 if (!S_ISLNK(st->st_mode) &&
189 (has_symlinks || !S_ISREG(st->st_mode)))
190 changed |= TYPE_CHANGED;
Kay Sievers8ae0a8c2005-05-05 14:38:25 +0200191 break;
Martin Waitz302b9282007-05-21 22:08:28 +0200192 case S_IFGITLINK:
Junio C Hamanoc70115b2008-07-29 01:13:44 -0700193 /* We ignore most of the st_xxx fields for gitlinks */
Linus Torvaldsf35a6d32007-04-09 21:20:29 -0700194 if (!S_ISDIR(st->st_mode))
195 changed |= TYPE_CHANGED;
196 else if (ce_compare_gitlink(ce))
197 changed |= DATA_CHANGED;
Linus Torvaldsa8ee75b2007-04-13 09:24:13 -0700198 return changed;
Kay Sievers8ae0a8c2005-05-05 14:38:25 +0200199 default:
Linus Torvalds7a51ed62008-01-14 16:03:17 -0800200 die("internal error: ce_mode is %o", ce->ce_mode);
Kay Sievers8ae0a8c2005-05-05 14:38:25 +0200201 }
Kjetil Barvikfba2f382009-02-19 21:08:29 +0100202 if (ce->ce_mtime.sec != (unsigned int)st->st_mtime)
Linus Torvalds734aab72005-04-09 09:48:20 -0700203 changed |= MTIME_CHANGED;
Kjetil Barvikfba2f382009-02-19 21:08:29 +0100204 if (trust_ctime && ce->ce_ctime.sec != (unsigned int)st->st_ctime)
Linus Torvalds734aab72005-04-09 09:48:20 -0700205 changed |= CTIME_CHANGED;
Linus Torvaldsccc4feb2005-04-15 10:44:27 -0700206
Kjetil Barvikfba2f382009-02-19 21:08:29 +0100207#ifdef USE_NSEC
Junio C Hamano110c46a2009-03-08 13:51:33 -0700208 if (ce->ce_mtime.nsec != ST_MTIME_NSEC(*st))
Kjetil Barvikfba2f382009-02-19 21:08:29 +0100209 changed |= MTIME_CHANGED;
Junio C Hamano110c46a2009-03-08 13:51:33 -0700210 if (trust_ctime && ce->ce_ctime.nsec != ST_CTIME_NSEC(*st))
Kjetil Barvikfba2f382009-02-19 21:08:29 +0100211 changed |= CTIME_CHANGED;
212#endif
213
Linus Torvalds7a51ed62008-01-14 16:03:17 -0800214 if (ce->ce_uid != (unsigned int) st->st_uid ||
215 ce->ce_gid != (unsigned int) st->st_gid)
Linus Torvalds734aab72005-04-09 09:48:20 -0700216 changed |= OWNER_CHANGED;
Linus Torvalds7a51ed62008-01-14 16:03:17 -0800217 if (ce->ce_ino != (unsigned int) st->st_ino)
Linus Torvalds734aab72005-04-09 09:48:20 -0700218 changed |= INODE_CHANGED;
Linus Torvalds2cb45e92005-05-22 15:08:15 -0700219
220#ifdef USE_STDEV
221 /*
222 * st_dev breaks on network filesystems where different
223 * clients will have different views of what "device"
224 * the filesystem is on
225 */
Linus Torvalds7a51ed62008-01-14 16:03:17 -0800226 if (ce->ce_dev != (unsigned int) st->st_dev)
Linus Torvalds2cb45e92005-05-22 15:08:15 -0700227 changed |= INODE_CHANGED;
228#endif
229
Linus Torvalds7a51ed62008-01-14 16:03:17 -0800230 if (ce->ce_size != (unsigned int) st->st_size)
Linus Torvalds734aab72005-04-09 09:48:20 -0700231 changed |= DATA_CHANGED;
Junio C Hamano29e4d362005-12-20 00:02:15 -0800232
Linus Torvaldsf49c2c22008-06-10 10:44:43 -0700233 /* Racily smudged entry? */
234 if (!ce->ce_size) {
235 if (!is_empty_blob_sha1(ce->sha1))
236 changed |= DATA_CHANGED;
237 }
238
Junio C Hamano407c8eb2005-12-20 12:12:18 -0800239 return changed;
240}
241
Linus Torvaldsd1f128b2008-03-06 12:46:09 -0800242static int is_racy_timestamp(const struct index_state *istate, struct cache_entry *ce)
Junio C Hamano6d91da62008-01-21 00:44:50 -0800243{
Junio C Hamano050288d2008-05-03 17:24:28 -0700244 return (!S_ISGITLINK(ce->ce_mode) &&
Kjetil Barvikfba2f382009-02-19 21:08:29 +0100245 istate->timestamp.sec &&
246#ifdef USE_NSEC
247 /* nanosecond timestamped files can also be racy! */
248 (istate->timestamp.sec < ce->ce_mtime.sec ||
249 (istate->timestamp.sec == ce->ce_mtime.sec &&
250 istate->timestamp.nsec <= ce->ce_mtime.nsec))
251#else
252 istate->timestamp.sec <= ce->ce_mtime.sec
253#endif
254 );
Junio C Hamano6d91da62008-01-21 00:44:50 -0800255}
256
Linus Torvaldsd1f128b2008-03-06 12:46:09 -0800257int ie_match_stat(const struct index_state *istate,
Junio C Hamano4bd5b7d2007-11-10 00:15:03 -0800258 struct cache_entry *ce, struct stat *st,
259 unsigned int options)
Junio C Hamano407c8eb2005-12-20 12:12:18 -0800260{
Junio C Hamano5f730762006-02-08 21:15:24 -0800261 unsigned int changed;
Junio C Hamano4bd5b7d2007-11-10 00:15:03 -0800262 int ignore_valid = options & CE_MATCH_IGNORE_VALID;
Nguyễn Thái Ngọc Duy56cac482009-12-14 18:43:58 +0700263 int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;
Junio C Hamano4bd5b7d2007-11-10 00:15:03 -0800264 int assume_racy_is_modified = options & CE_MATCH_RACY_IS_DIRTY;
Junio C Hamano5f730762006-02-08 21:15:24 -0800265
266 /*
267 * If it's marked as always valid in the index, it's
268 * valid whatever the checked-out copy says.
Nguyễn Thái Ngọc Duy56cac482009-12-14 18:43:58 +0700269 *
270 * skip-worktree has the same effect with higher precedence
Junio C Hamano5f730762006-02-08 21:15:24 -0800271 */
Nguyễn Thái Ngọc Duy56cac482009-12-14 18:43:58 +0700272 if (!ignore_skip_worktree && ce_skip_worktree(ce))
273 return 0;
Linus Torvalds7a51ed62008-01-14 16:03:17 -0800274 if (!ignore_valid && (ce->ce_flags & CE_VALID))
Junio C Hamano5f730762006-02-08 21:15:24 -0800275 return 0;
276
Junio C Hamano331fcb52008-11-28 19:56:34 -0800277 /*
278 * Intent-to-add entries have not been added, so the index entry
279 * by definition never matches what is in the work tree until it
280 * actually gets added.
281 */
282 if (ce->ce_flags & CE_INTENT_TO_ADD)
283 return DATA_CHANGED | TYPE_CHANGED | MODE_CHANGED;
284
Junio C Hamano5f730762006-02-08 21:15:24 -0800285 changed = ce_match_stat_basic(ce, st);
Junio C Hamano407c8eb2005-12-20 12:12:18 -0800286
Junio C Hamano29e4d362005-12-20 00:02:15 -0800287 /*
288 * Within 1 second of this sequence:
289 * echo xyzzy >file && git-update-index --add file
290 * running this command:
291 * echo frotz >file
292 * would give a falsely clean cache entry. The mtime and
293 * length match the cache, and other stat fields do not change.
294 *
295 * We could detect this at update-index time (the cache entry
296 * being registered/updated records the same time as "now")
297 * and delay the return from git-update-index, but that would
298 * effectively mean we can make at most one commit per second,
299 * which is not acceptable. Instead, we check cache entries
300 * whose mtime are the same as the index file timestamp more
Junio C Hamano5f730762006-02-08 21:15:24 -0800301 * carefully than others.
Junio C Hamano29e4d362005-12-20 00:02:15 -0800302 */
Junio C Hamano6d91da62008-01-21 00:44:50 -0800303 if (!changed && is_racy_timestamp(istate, ce)) {
Junio C Hamano42f77402006-08-15 21:38:07 -0700304 if (assume_racy_is_modified)
305 changed |= DATA_CHANGED;
306 else
307 changed |= ce_modified_check_fs(ce, st);
308 }
Junio C Hamano29e4d362005-12-20 00:02:15 -0800309
Linus Torvalds734aab72005-04-09 09:48:20 -0700310 return changed;
311}
312
Linus Torvaldsd1f128b2008-03-06 12:46:09 -0800313int ie_modified(const struct index_state *istate,
Junio C Hamano4bd5b7d2007-11-10 00:15:03 -0800314 struct cache_entry *ce, struct stat *st, unsigned int options)
Junio C Hamanob0391892005-09-19 15:11:15 -0700315{
Junio C Hamano29e4d362005-12-20 00:02:15 -0800316 int changed, changed_fs;
Junio C Hamano4bd5b7d2007-11-10 00:15:03 -0800317
318 changed = ie_match_stat(istate, ce, st, options);
Junio C Hamanob0391892005-09-19 15:11:15 -0700319 if (!changed)
320 return 0;
Junio C Hamanob0391892005-09-19 15:11:15 -0700321 /*
322 * If the mode or type has changed, there's no point in trying
323 * to refresh the entry - it's not going to match
324 */
325 if (changed & (MODE_CHANGED | TYPE_CHANGED))
326 return changed;
327
Junio C Hamanoc70115b2008-07-29 01:13:44 -0700328 /*
329 * Immediately after read-tree or update-index --cacheinfo,
330 * the length field is zero, as we have never even read the
331 * lstat(2) information once, and we cannot trust DATA_CHANGED
332 * returned by ie_match_stat() which in turn was returned by
333 * ce_match_stat_basic() to signal that the filesize of the
334 * blob changed. We have to actually go to the filesystem to
335 * see if the contents match, and if so, should answer "unchanged".
336 *
337 * The logic does not apply to gitlinks, as ce_match_stat_basic()
338 * already has checked the actual HEAD from the filesystem in the
339 * subproject. If ie_match_stat() already said it is different,
340 * then we know it is.
Junio C Hamanob0391892005-09-19 15:11:15 -0700341 */
Junio C Hamanoc70115b2008-07-29 01:13:44 -0700342 if ((changed & DATA_CHANGED) &&
343 (S_ISGITLINK(ce->ce_mode) || ce->ce_size != 0))
Junio C Hamanob0391892005-09-19 15:11:15 -0700344 return changed;
345
Junio C Hamano29e4d362005-12-20 00:02:15 -0800346 changed_fs = ce_modified_check_fs(ce, st);
347 if (changed_fs)
348 return changed | changed_fs;
Junio C Hamanob0391892005-09-19 15:11:15 -0700349 return 0;
350}
351
Linus Torvalds958ba6c2005-05-20 09:09:18 -0700352int base_name_compare(const char *name1, int len1, int mode1,
353 const char *name2, int len2, int mode2)
354{
355 unsigned char c1, c2;
356 int len = len1 < len2 ? len1 : len2;
357 int cmp;
358
359 cmp = memcmp(name1, name2, len);
360 if (cmp)
361 return cmp;
362 c1 = name1[len];
363 c2 = name2[len];
Linus Torvalds1833a922007-04-11 14:39:12 -0700364 if (!c1 && S_ISDIR(mode1))
Linus Torvalds958ba6c2005-05-20 09:09:18 -0700365 c1 = '/';
Linus Torvalds1833a922007-04-11 14:39:12 -0700366 if (!c2 && S_ISDIR(mode2))
Linus Torvalds958ba6c2005-05-20 09:09:18 -0700367 c2 = '/';
368 return (c1 < c2) ? -1 : (c1 > c2) ? 1 : 0;
369}
370
Linus Torvalds0ab9e1e2008-03-05 18:25:10 -0800371/*
372 * df_name_compare() is identical to base_name_compare(), except it
373 * compares conflicting directory/file entries as equal. Note that
374 * while a directory name compares as equal to a regular file, they
375 * then individually compare _differently_ to a filename that has
376 * a dot after the basename (because '\0' < '.' < '/').
377 *
378 * This is used by routines that want to traverse the git namespace
379 * but then handle conflicting entries together when possible.
380 */
381int df_name_compare(const char *name1, int len1, int mode1,
382 const char *name2, int len2, int mode2)
383{
384 int len = len1 < len2 ? len1 : len2, cmp;
385 unsigned char c1, c2;
386
387 cmp = memcmp(name1, name2, len);
388 if (cmp)
389 return cmp;
390 /* Directories and files compare equal (same length, same name) */
391 if (len1 == len2)
392 return 0;
393 c1 = name1[len];
394 if (!c1 && S_ISDIR(mode1))
395 c1 = '/';
396 c2 = name2[len];
397 if (!c2 && S_ISDIR(mode2))
398 c2 = '/';
399 if (c1 == '/' && !c2)
400 return 0;
401 if (c2 == '/' && !c1)
402 return 0;
403 return c1 - c2;
404}
405
Linus Torvalds95fd5bf2005-04-15 22:51:44 -0700406int cache_name_compare(const char *name1, int flags1, const char *name2, int flags2)
Linus Torvaldseb38c222005-04-09 09:26:55 -0700407{
Linus Torvalds95fd5bf2005-04-15 22:51:44 -0700408 int len1 = flags1 & CE_NAMEMASK;
409 int len2 = flags2 & CE_NAMEMASK;
Linus Torvaldseb38c222005-04-09 09:26:55 -0700410 int len = len1 < len2 ? len1 : len2;
411 int cmp;
412
413 cmp = memcmp(name1, name2, len);
414 if (cmp)
415 return cmp;
416 if (len1 < len2)
417 return -1;
418 if (len1 > len2)
419 return 1;
Junio C Hamano5f730762006-02-08 21:15:24 -0800420
Junio C Hamano7b80be12006-02-12 23:46:25 -0800421 /* Compare stages */
422 flags1 &= CE_STAGEMASK;
423 flags2 &= CE_STAGEMASK;
Junio C Hamano5f730762006-02-08 21:15:24 -0800424
Linus Torvalds95fd5bf2005-04-15 22:51:44 -0700425 if (flags1 < flags2)
426 return -1;
427 if (flags1 > flags2)
428 return 1;
Linus Torvaldseb38c222005-04-09 09:26:55 -0700429 return 0;
430}
431
Linus Torvaldsd1f128b2008-03-06 12:46:09 -0800432int index_name_pos(const struct index_state *istate, const char *name, int namelen)
Linus Torvaldseb38c222005-04-09 09:26:55 -0700433{
434 int first, last;
435
436 first = 0;
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700437 last = istate->cache_nr;
Linus Torvaldseb38c222005-04-09 09:26:55 -0700438 while (last > first) {
439 int next = (last + first) >> 1;
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700440 struct cache_entry *ce = istate->cache[next];
Linus Torvalds7a51ed62008-01-14 16:03:17 -0800441 int cmp = cache_name_compare(name, namelen, ce->name, ce->ce_flags);
Linus Torvaldseb38c222005-04-09 09:26:55 -0700442 if (!cmp)
Linus Torvalds76e7f4e2005-04-10 22:06:50 -0700443 return next;
Linus Torvaldseb38c222005-04-09 09:26:55 -0700444 if (cmp < 0) {
445 last = next;
446 continue;
447 }
448 first = next+1;
449 }
Linus Torvalds76e7f4e2005-04-10 22:06:50 -0700450 return -first-1;
Linus Torvaldseb38c222005-04-09 09:26:55 -0700451}
452
Linus Torvalds7b937ca2005-04-16 12:05:45 -0700453/* Remove entry, return true if there are more entries to go.. */
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700454int remove_index_entry_at(struct index_state *istate, int pos)
Linus Torvalds7b937ca2005-04-16 12:05:45 -0700455{
Linus Torvaldscf558702008-01-22 18:41:14 -0800456 struct cache_entry *ce = istate->cache[pos];
457
Junio C Hamanocfc57892009-12-25 00:30:51 -0800458 record_resolve_undo(istate, ce);
Linus Torvalds96872bc2008-03-21 13:16:24 -0700459 remove_name_hash(ce);
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700460 istate->cache_changed = 1;
461 istate->cache_nr--;
462 if (pos >= istate->cache_nr)
Linus Torvalds7b937ca2005-04-16 12:05:45 -0700463 return 0;
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700464 memmove(istate->cache + pos,
465 istate->cache + pos + 1,
466 (istate->cache_nr - pos) * sizeof(struct cache_entry *));
Linus Torvalds7b937ca2005-04-16 12:05:45 -0700467 return 1;
468}
469
Kjetil Barvik36419c82009-02-18 23:18:03 +0100470/*
471 * Remove all cache ententries marked for removal, that is where
472 * CE_REMOVE is set in ce_flags. This is much more effective than
473 * calling remove_index_entry_at() for each entry to be removed.
474 */
475void remove_marked_cache_entries(struct index_state *istate)
476{
477 struct cache_entry **ce_array = istate->cache;
478 unsigned int i, j;
479
480 for (i = j = 0; i < istate->cache_nr; i++) {
481 if (ce_array[i]->ce_flags & CE_REMOVE)
482 remove_name_hash(ce_array[i]);
483 else
484 ce_array[j++] = ce_array[i];
485 }
486 istate->cache_changed = 1;
487 istate->cache_nr = j;
488}
489
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700490int remove_file_from_index(struct index_state *istate, const char *path)
Linus Torvalds197ee8c2005-04-09 12:09:27 -0700491{
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700492 int pos = index_name_pos(istate, path, strlen(path));
Junio C Hamanoc4e3cca2005-04-17 09:53:35 -0700493 if (pos < 0)
494 pos = -pos-1;
Junio C Hamano09d5dc32007-09-13 20:33:11 -0700495 cache_tree_invalidate_path(istate->cache_tree, path);
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700496 while (pos < istate->cache_nr && !strcmp(istate->cache[pos]->name, path))
497 remove_index_entry_at(istate, pos);
Linus Torvalds197ee8c2005-04-09 12:09:27 -0700498 return 0;
499}
500
Johannes Schindelin20314272007-06-29 18:32:46 +0100501static int compare_name(struct cache_entry *ce, const char *path, int namelen)
502{
503 return namelen != ce_namelen(ce) || memcmp(path, ce->name, namelen);
504}
505
506static int index_name_pos_also_unmerged(struct index_state *istate,
507 const char *path, int namelen)
508{
509 int pos = index_name_pos(istate, path, namelen);
510 struct cache_entry *ce;
511
512 if (pos >= 0)
513 return pos;
514
515 /* maybe unmerged? */
516 pos = -1 - pos;
517 if (pos >= istate->cache_nr ||
518 compare_name((ce = istate->cache[pos]), path, namelen))
519 return -1;
520
521 /* order of preference: stage 2, 1, 3 */
522 if (ce_stage(ce) == 1 && pos + 1 < istate->cache_nr &&
523 ce_stage((ce = istate->cache[pos + 1])) == 2 &&
524 !compare_name(ce, path, namelen))
525 pos++;
526 return pos;
527}
528
Linus Torvalds11029522008-03-22 14:22:44 -0700529static int different_name(struct cache_entry *ce, struct cache_entry *alias)
530{
531 int len = ce_namelen(ce);
532 return ce_namelen(alias) != len || memcmp(ce->name, alias->name, len);
533}
534
535/*
536 * If we add a filename that aliases in the cache, we will use the
537 * name that we already have - but we don't want to update the same
538 * alias twice, because that implies that there were actually two
539 * different files with aliasing names!
540 *
541 * So we use the CE_ADDED flag to verify that the alias was an old
542 * one before we accept it as
543 */
544static struct cache_entry *create_alias_ce(struct cache_entry *ce, struct cache_entry *alias)
545{
546 int len;
547 struct cache_entry *new;
548
549 if (alias->ce_flags & CE_ADDED)
550 die("Will not add file alias '%s' ('%s' already exists in index)", ce->name, alias->name);
551
552 /* Ok, create the new entry using the name of the existing alias */
553 len = ce_namelen(alias);
554 new = xcalloc(1, cache_entry_size(len));
555 memcpy(new->name, alias->name, len);
556 copy_cache_entry(new, ce);
557 free(ce);
558 return new;
559}
560
Junio C Hamano39425812008-08-21 01:44:53 -0700561static void record_intent_to_add(struct cache_entry *ce)
562{
563 unsigned char sha1[20];
564 if (write_sha1_file("", 0, blob_type, sha1))
565 die("cannot create an empty blob in the object database");
566 hashcpy(ce->sha1, sha1);
567}
568
Junio C Hamano38ed1d82008-05-21 12:04:34 -0700569int add_to_index(struct index_state *istate, const char *path, struct stat *st, int flags)
Johannes Schindelin11be42a2006-07-26 03:52:35 +0200570{
Junio C Hamano38ed1d82008-05-21 12:04:34 -0700571 int size, namelen, was_same;
Linus Torvaldsd177cab2008-05-09 09:11:43 -0700572 mode_t st_mode = st->st_mode;
Linus Torvalds68355502008-03-22 13:19:49 -0700573 struct cache_entry *ce, *alias;
Nguyễn Thái Ngọc Duy56cac482009-12-14 18:43:58 +0700574 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 -0700575 int verbose = flags & (ADD_CACHE_VERBOSE | ADD_CACHE_PRETEND);
576 int pretend = flags & ADD_CACHE_PRETEND;
Junio C Hamano39425812008-08-21 01:44:53 -0700577 int intent_only = flags & ADD_CACHE_INTENT;
578 int add_option = (ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE|
579 (intent_only ? ADD_CACHE_NEW_ONLY : 0));
Johannes Schindelin11be42a2006-07-26 03:52:35 +0200580
Linus Torvaldsd177cab2008-05-09 09:11:43 -0700581 if (!S_ISREG(st_mode) && !S_ISLNK(st_mode) && !S_ISDIR(st_mode))
Alex Riesen960b8ad2008-05-12 19:57:45 +0200582 return error("%s: can only add regular files, symbolic links or git-directories", path);
Johannes Schindelin11be42a2006-07-26 03:52:35 +0200583
584 namelen = strlen(path);
Linus Torvaldsd177cab2008-05-09 09:11:43 -0700585 if (S_ISDIR(st_mode)) {
Linus Torvalds09595252007-04-11 14:49:44 -0700586 while (namelen && path[namelen-1] == '/')
587 namelen--;
588 }
Johannes Schindelin11be42a2006-07-26 03:52:35 +0200589 size = cache_entry_size(namelen);
590 ce = xcalloc(1, size);
591 memcpy(ce->name, path, namelen);
Linus Torvalds7a51ed62008-01-14 16:03:17 -0800592 ce->ce_flags = namelen;
Junio C Hamano39425812008-08-21 01:44:53 -0700593 if (!intent_only)
594 fill_stat_cache_info(ce, st);
Junio C Hamano388b2ac2008-11-28 19:55:25 -0800595 else
596 ce->ce_flags |= CE_INTENT_TO_ADD;
Johannes Schindelin11be42a2006-07-26 03:52:35 +0200597
Johannes Sixt78a8d642007-03-02 22:11:30 +0100598 if (trust_executable_bit && has_symlinks)
Linus Torvaldsd177cab2008-05-09 09:11:43 -0700599 ce->ce_mode = create_ce_mode(st_mode);
Junio C Hamano185c9752007-02-16 22:43:48 -0800600 else {
Johannes Sixt78a8d642007-03-02 22:11:30 +0100601 /* If there is an existing entry, pick the mode bits and type
602 * from it, otherwise assume unexecutable regular file.
Johannes Schindelin11be42a2006-07-26 03:52:35 +0200603 */
Junio C Hamano185c9752007-02-16 22:43:48 -0800604 struct cache_entry *ent;
Johannes Schindelin20314272007-06-29 18:32:46 +0100605 int pos = index_name_pos_also_unmerged(istate, path, namelen);
Junio C Hamano185c9752007-02-16 22:43:48 -0800606
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700607 ent = (0 <= pos) ? istate->cache[pos] : NULL;
Linus Torvaldsd177cab2008-05-09 09:11:43 -0700608 ce->ce_mode = ce_mode_from_stat(ent, st_mode);
Johannes Schindelin11be42a2006-07-26 03:52:35 +0200609 }
610
Joshua Jensendc1ae702010-10-03 09:56:45 +0000611 /* When core.ignorecase=true, determine if a directory of the same name but differing
612 * case already exists within the Git repository. If it does, ensure the directory
613 * case of the file being added to the repository matches (is folded into) the existing
614 * entry's directory case.
615 */
616 if (ignore_case) {
617 const char *startPtr = ce->name;
618 const char *ptr = startPtr;
619 while (*ptr) {
620 while (*ptr && *ptr != '/')
621 ++ptr;
622 if (*ptr == '/') {
623 struct cache_entry *foundce;
624 ++ptr;
625 foundce = index_name_exists(&the_index, ce->name, ptr - ce->name, ignore_case);
626 if (foundce) {
627 memcpy((void *)startPtr, foundce->name + (startPtr - ce->name), ptr - startPtr);
628 startPtr = ptr;
629 }
630 }
631 }
632 }
633
Linus Torvalds68355502008-03-22 13:19:49 -0700634 alias = index_name_exists(istate, ce->name, ce_namelen(ce), ignore_case);
Linus Torvaldsd177cab2008-05-09 09:11:43 -0700635 if (alias && !ce_stage(alias) && !ie_match_stat(istate, alias, st, ce_option)) {
Junio C Hamano0781b8a2007-07-30 17:12:58 -0700636 /* Nothing changed, really */
637 free(ce);
Junio C Hamano125fd982010-01-24 00:10:20 -0800638 if (!S_ISGITLINK(alias->ce_mode))
639 ce_mark_uptodate(alias);
Linus Torvalds11029522008-03-22 14:22:44 -0700640 alias->ce_flags |= CE_ADDED;
Junio C Hamano0781b8a2007-07-30 17:12:58 -0700641 return 0;
642 }
Junio C Hamano39425812008-08-21 01:44:53 -0700643 if (!intent_only) {
Junio C Hamanoc4ce46f2011-05-08 01:47:33 -0700644 if (index_path(ce->sha1, path, st, HASH_WRITE_OBJECT))
Junio C Hamano39425812008-08-21 01:44:53 -0700645 return error("unable to index file %s", path);
646 } else
647 record_intent_to_add(ce);
648
Linus Torvalds11029522008-03-22 14:22:44 -0700649 if (ignore_case && alias && different_name(ce, alias))
650 ce = create_alias_ce(ce, alias);
651 ce->ce_flags |= CE_ADDED;
Junio C Hamano38ed1d82008-05-21 12:04:34 -0700652
Junio C Hamano3bf0dd12008-07-16 18:48:58 -0700653 /* It was suspected to be racily clean, but it turns out to be Ok */
Junio C Hamano38ed1d82008-05-21 12:04:34 -0700654 was_same = (alias &&
655 !ce_stage(alias) &&
656 !hashcmp(alias->sha1, ce->sha1) &&
657 ce->ce_mode == alias->ce_mode);
658
659 if (pretend)
660 ;
Junio C Hamano39425812008-08-21 01:44:53 -0700661 else if (add_index_entry(istate, ce, add_option))
Alex Riesen960b8ad2008-05-12 19:57:45 +0200662 return error("unable to add %s to index",path);
Junio C Hamano38ed1d82008-05-21 12:04:34 -0700663 if (verbose && !was_same)
Johannes Schindelin11be42a2006-07-26 03:52:35 +0200664 printf("add '%s'\n", path);
Johannes Schindelin11be42a2006-07-26 03:52:35 +0200665 return 0;
666}
667
Junio C Hamano38ed1d82008-05-21 12:04:34 -0700668int add_file_to_index(struct index_state *istate, const char *path, int flags)
Linus Torvaldsd177cab2008-05-09 09:11:43 -0700669{
670 struct stat st;
671 if (lstat(path, &st))
Thomas Rastd824cbb2009-06-27 17:58:46 +0200672 die_errno("unable to stat '%s'", path);
Junio C Hamano38ed1d82008-05-21 12:04:34 -0700673 return add_to_index(istate, path, &st, flags);
Linus Torvaldsd177cab2008-05-09 09:11:43 -0700674}
675
Carlos Rica6640f882007-09-11 05:17:28 +0200676struct cache_entry *make_cache_entry(unsigned int mode,
677 const unsigned char *sha1, const char *path, int stage,
678 int refresh)
679{
680 int size, len;
681 struct cache_entry *ce;
682
Dmitry Potapov7e7abea2008-10-11 20:39:37 +0400683 if (!verify_path(path)) {
684 error("Invalid path '%s'", path);
Carlos Rica6640f882007-09-11 05:17:28 +0200685 return NULL;
Dmitry Potapov7e7abea2008-10-11 20:39:37 +0400686 }
Carlos Rica6640f882007-09-11 05:17:28 +0200687
688 len = strlen(path);
689 size = cache_entry_size(len);
690 ce = xcalloc(1, size);
691
692 hashcpy(ce->sha1, sha1);
693 memcpy(ce->name, path, len);
694 ce->ce_flags = create_ce_flags(len, stage);
695 ce->ce_mode = create_ce_mode(mode);
696
697 if (refresh)
698 return refresh_cache_entry(ce, 0);
699
700 return ce;
701}
702
Brad Robertsdbbce552005-05-14 19:04:25 -0700703int ce_same_name(struct cache_entry *a, struct cache_entry *b)
Linus Torvalds7b937ca2005-04-16 12:05:45 -0700704{
705 int len = ce_namelen(a);
706 return ce_namelen(b) == len && !memcmp(a->name, b->name, len);
707}
708
Nguyễn Thái Ngọc Duyeb9cb552010-12-17 19:43:07 +0700709int ce_path_match(const struct cache_entry *ce, const struct pathspec *pathspec)
Linus Torvaldsc0fd1f52005-07-14 16:55:06 -0700710{
Nguyễn Thái Ngọc Duy898bbd92010-12-15 22:02:50 +0700711 return match_pathspec_depth(pathspec, ce->name, ce_namelen(ce), 0, NULL);
Linus Torvaldsc0fd1f52005-07-14 16:55:06 -0700712}
713
Linus Torvalds12676602005-06-18 20:21:34 -0700714/*
Linus Torvalds8dcf39c2006-05-18 12:07:31 -0700715 * We fundamentally don't like some paths: we don't want
716 * dot or dot-dot anywhere, and for obvious reasons don't
717 * want to recurse into ".git" either.
718 *
719 * Also, we don't want double slashes or slashes at the
720 * end that can make pathnames ambiguous.
721 */
722static int verify_dotfile(const char *rest)
723{
724 /*
725 * The first character was '.', but that
726 * has already been discarded, we now test
727 * the rest.
728 */
Theo Niessinke0f530f2011-06-08 14:04:41 +0200729
Linus Torvalds8dcf39c2006-05-18 12:07:31 -0700730 /* "." is not allowed */
Theo Niessinke0f530f2011-06-08 14:04:41 +0200731 if (*rest == '\0' || is_dir_sep(*rest))
Linus Torvalds8dcf39c2006-05-18 12:07:31 -0700732 return 0;
733
Theo Niessinke0f530f2011-06-08 14:04:41 +0200734 switch (*rest) {
Linus Torvalds8dcf39c2006-05-18 12:07:31 -0700735 /*
736 * ".git" followed by NUL or slash is bad. This
737 * shares the path end test with the ".." case.
738 */
739 case 'g':
740 if (rest[1] != 'i')
741 break;
742 if (rest[2] != 't')
743 break;
744 rest += 2;
745 /* fallthrough */
746 case '.':
Theo Niessinke0f530f2011-06-08 14:04:41 +0200747 if (rest[1] == '\0' || is_dir_sep(rest[1]))
Linus Torvalds8dcf39c2006-05-18 12:07:31 -0700748 return 0;
749 }
750 return 1;
751}
752
753int verify_path(const char *path)
754{
755 char c;
756
Erik Faye-Lund56948cb2011-05-27 18:00:40 +0200757 if (has_dos_drive_prefix(path))
758 return 0;
759
Linus Torvalds8dcf39c2006-05-18 12:07:31 -0700760 goto inside;
761 for (;;) {
762 if (!c)
763 return 1;
Erik Faye-Lund56948cb2011-05-27 18:00:40 +0200764 if (is_dir_sep(c)) {
Linus Torvalds8dcf39c2006-05-18 12:07:31 -0700765inside:
766 c = *path++;
Junio C Hamano3bdf09c2011-06-06 20:49:06 -0700767 if ((c == '.' && !verify_dotfile(path)) ||
768 is_dir_sep(c) || c == '\0')
769 return 0;
Linus Torvalds8dcf39c2006-05-18 12:07:31 -0700770 }
771 c = *path++;
772 }
773}
774
775/*
Linus Torvalds12676602005-06-18 20:21:34 -0700776 * Do we have another file that has the beginning components being a
777 * proper superset of the name we're trying to add?
778 */
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700779static int has_file_name(struct index_state *istate,
780 const struct cache_entry *ce, int pos, int ok_to_replace)
Linus Torvalds12676602005-06-18 20:21:34 -0700781{
782 int retval = 0;
783 int len = ce_namelen(ce);
Junio C Hamanob1557252005-06-25 02:25:29 -0700784 int stage = ce_stage(ce);
Linus Torvalds12676602005-06-18 20:21:34 -0700785 const char *name = ce->name;
786
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700787 while (pos < istate->cache_nr) {
788 struct cache_entry *p = istate->cache[pos++];
Linus Torvalds12676602005-06-18 20:21:34 -0700789
790 if (len >= ce_namelen(p))
791 break;
792 if (memcmp(name, p->name, len))
793 break;
Junio C Hamanob1557252005-06-25 02:25:29 -0700794 if (ce_stage(p) != stage)
795 continue;
Linus Torvalds12676602005-06-18 20:21:34 -0700796 if (p->name[len] != '/')
797 continue;
Linus Torvalds7a51ed62008-01-14 16:03:17 -0800798 if (p->ce_flags & CE_REMOVE)
Junio C Hamano21cd8d02007-03-30 01:55:37 -0700799 continue;
Linus Torvalds12676602005-06-18 20:21:34 -0700800 retval = -1;
801 if (!ok_to_replace)
802 break;
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700803 remove_index_entry_at(istate, --pos);
Linus Torvalds12676602005-06-18 20:21:34 -0700804 }
805 return retval;
806}
807
808/*
809 * Do we have another file with a pathname that is a proper
810 * subset of the name we're trying to add?
811 */
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700812static int has_dir_name(struct index_state *istate,
813 const struct cache_entry *ce, int pos, int ok_to_replace)
Linus Torvalds12676602005-06-18 20:21:34 -0700814{
815 int retval = 0;
Junio C Hamanob1557252005-06-25 02:25:29 -0700816 int stage = ce_stage(ce);
Linus Torvalds12676602005-06-18 20:21:34 -0700817 const char *name = ce->name;
818 const char *slash = name + ce_namelen(ce);
819
820 for (;;) {
821 int len;
822
823 for (;;) {
824 if (*--slash == '/')
825 break;
826 if (slash <= ce->name)
827 return retval;
828 }
829 len = slash - name;
830
Linus Torvalds7a51ed62008-01-14 16:03:17 -0800831 pos = index_name_pos(istate, name, create_ce_flags(len, stage));
Linus Torvalds12676602005-06-18 20:21:34 -0700832 if (pos >= 0) {
Junio C Hamano21cd8d02007-03-30 01:55:37 -0700833 /*
834 * Found one, but not so fast. This could
835 * be a marker that says "I was here, but
836 * I am being removed". Such an entry is
837 * not a part of the resulting tree, and
838 * it is Ok to have a directory at the same
839 * path.
840 */
Junio C Hamano077c48d2008-01-22 21:24:21 -0800841 if (!(istate->cache[pos]->ce_flags & CE_REMOVE)) {
Junio C Hamano21cd8d02007-03-30 01:55:37 -0700842 retval = -1;
843 if (!ok_to_replace)
844 break;
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700845 remove_index_entry_at(istate, pos);
Junio C Hamano21cd8d02007-03-30 01:55:37 -0700846 continue;
847 }
Linus Torvalds12676602005-06-18 20:21:34 -0700848 }
Junio C Hamano21cd8d02007-03-30 01:55:37 -0700849 else
850 pos = -pos-1;
Linus Torvalds12676602005-06-18 20:21:34 -0700851
852 /*
853 * Trivial optimization: if we find an entry that
854 * already matches the sub-directory, then we know
Junio C Hamanob1557252005-06-25 02:25:29 -0700855 * we're ok, and we can exit.
Linus Torvalds12676602005-06-18 20:21:34 -0700856 */
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700857 while (pos < istate->cache_nr) {
858 struct cache_entry *p = istate->cache[pos];
Junio C Hamanob1557252005-06-25 02:25:29 -0700859 if ((ce_namelen(p) <= len) ||
860 (p->name[len] != '/') ||
861 memcmp(p->name, name, len))
862 break; /* not our subdirectory */
Junio C Hamano077c48d2008-01-22 21:24:21 -0800863 if (ce_stage(p) == stage && !(p->ce_flags & CE_REMOVE))
864 /*
865 * p is at the same stage as our entry, and
Junio C Hamanob1557252005-06-25 02:25:29 -0700866 * is a subdirectory of what we are looking
867 * at, so we cannot have conflicts at our
868 * level or anything shorter.
869 */
870 return retval;
871 pos++;
Linus Torvalds12676602005-06-18 20:21:34 -0700872 }
873 }
874 return retval;
875}
876
Junio C Hamano0f1e4f02005-05-07 21:48:12 -0700877/* We may be in a situation where we already have path/file and path
878 * is being added, or we already have path and path/file is being
879 * added. Either one would result in a nonsense tree that has path
880 * twice when git-write-tree tries to write it out. Prevent it.
Junio C Hamanoa6080a02007-06-07 00:04:01 -0700881 *
Junio C Hamano192268c2005-05-07 21:55:21 -0700882 * If ok-to-replace is specified, we remove the conflicting entries
883 * from the cache so the caller should recompute the insert position.
884 * When this happens, we return non-zero.
Junio C Hamano0f1e4f02005-05-07 21:48:12 -0700885 */
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700886static int check_file_directory_conflict(struct index_state *istate,
887 const struct cache_entry *ce,
888 int pos, int ok_to_replace)
Junio C Hamano0f1e4f02005-05-07 21:48:12 -0700889{
Junio C Hamano21cd8d02007-03-30 01:55:37 -0700890 int retval;
891
892 /*
893 * When ce is an "I am going away" entry, we allow it to be added
894 */
Linus Torvalds7a51ed62008-01-14 16:03:17 -0800895 if (ce->ce_flags & CE_REMOVE)
Junio C Hamano21cd8d02007-03-30 01:55:37 -0700896 return 0;
897
Junio C Hamano0f1e4f02005-05-07 21:48:12 -0700898 /*
Linus Torvalds12676602005-06-18 20:21:34 -0700899 * We check if the path is a sub-path of a subsequent pathname
900 * first, since removing those will not change the position
Junio C Hamano21cd8d02007-03-30 01:55:37 -0700901 * in the array.
Junio C Hamano0f1e4f02005-05-07 21:48:12 -0700902 */
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700903 retval = has_file_name(istate, ce, pos, ok_to_replace);
Junio C Hamano21cd8d02007-03-30 01:55:37 -0700904
Linus Torvalds12676602005-06-18 20:21:34 -0700905 /*
906 * Then check if the path might have a clashing sub-directory
907 * before it.
Junio C Hamano0f1e4f02005-05-07 21:48:12 -0700908 */
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700909 return retval + has_dir_name(istate, ce, pos, ok_to_replace);
Junio C Hamano0f1e4f02005-05-07 21:48:12 -0700910}
911
Junio C Hamanoaf3785d2007-08-09 13:42:50 -0700912static int add_index_entry_with_check(struct index_state *istate, struct cache_entry *ce, int option)
Linus Torvalds197ee8c2005-04-09 12:09:27 -0700913{
914 int pos;
Junio C Hamano192268c2005-05-07 21:55:21 -0700915 int ok_to_add = option & ADD_CACHE_OK_TO_ADD;
916 int ok_to_replace = option & ADD_CACHE_OK_TO_REPLACE;
Junio C Hamanob1557252005-06-25 02:25:29 -0700917 int skip_df_check = option & ADD_CACHE_SKIP_DFCHECK;
Junio C Hamano39425812008-08-21 01:44:53 -0700918 int new_only = option & ADD_CACHE_NEW_ONLY;
Junio C Hamano5f730762006-02-08 21:15:24 -0800919
Junio C Hamano09d5dc32007-09-13 20:33:11 -0700920 cache_tree_invalidate_path(istate->cache_tree, ce->name);
Linus Torvalds7a51ed62008-01-14 16:03:17 -0800921 pos = index_name_pos(istate, ce->name, ce->ce_flags);
Linus Torvalds197ee8c2005-04-09 12:09:27 -0700922
Junio C Hamano3e09cdf2005-10-11 18:45:33 -0700923 /* existing match? Just replace it. */
Linus Torvalds76e7f4e2005-04-10 22:06:50 -0700924 if (pos >= 0) {
Junio C Hamano39425812008-08-21 01:44:53 -0700925 if (!new_only)
926 replace_index_entry(istate, pos, ce);
Linus Torvalds197ee8c2005-04-09 12:09:27 -0700927 return 0;
928 }
Linus Torvalds76e7f4e2005-04-10 22:06:50 -0700929 pos = -pos-1;
Linus Torvalds197ee8c2005-04-09 12:09:27 -0700930
Linus Torvalds7b937ca2005-04-16 12:05:45 -0700931 /*
932 * Inserting a merged entry ("stage 0") into the index
933 * will always replace all non-merged entries..
934 */
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700935 if (pos < istate->cache_nr && ce_stage(ce) == 0) {
936 while (ce_same_name(istate->cache[pos], ce)) {
Linus Torvalds7b937ca2005-04-16 12:05:45 -0700937 ok_to_add = 1;
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700938 if (!remove_index_entry_at(istate, pos))
Linus Torvalds7b937ca2005-04-16 12:05:45 -0700939 break;
940 }
941 }
942
Linus Torvalds121481a2005-04-10 11:32:54 -0700943 if (!ok_to_add)
944 return -1;
Linus Torvalds8dcf39c2006-05-18 12:07:31 -0700945 if (!verify_path(ce->name))
Dmitry Potapov7e7abea2008-10-11 20:39:37 +0400946 return error("Invalid path '%s'", ce->name);
Linus Torvalds121481a2005-04-10 11:32:54 -0700947
Junio C Hamano3e09cdf2005-10-11 18:45:33 -0700948 if (!skip_df_check &&
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700949 check_file_directory_conflict(istate, ce, pos, ok_to_replace)) {
Junio C Hamano192268c2005-05-07 21:55:21 -0700950 if (!ok_to_replace)
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700951 return error("'%s' appears as both a file and as a directory",
952 ce->name);
Linus Torvalds7a51ed62008-01-14 16:03:17 -0800953 pos = index_name_pos(istate, ce->name, ce->ce_flags);
Junio C Hamano192268c2005-05-07 21:55:21 -0700954 pos = -pos-1;
955 }
Junio C Hamanoaf3785d2007-08-09 13:42:50 -0700956 return pos + 1;
957}
958
959int add_index_entry(struct index_state *istate, struct cache_entry *ce, int option)
960{
961 int pos;
962
963 if (option & ADD_CACHE_JUST_APPEND)
964 pos = istate->cache_nr;
965 else {
966 int ret;
967 ret = add_index_entry_with_check(istate, ce, option);
968 if (ret <= 0)
969 return ret;
970 pos = ret - 1;
971 }
Junio C Hamano0f1e4f02005-05-07 21:48:12 -0700972
Linus Torvalds197ee8c2005-04-09 12:09:27 -0700973 /* Make sure the array is big enough .. */
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700974 if (istate->cache_nr == istate->cache_alloc) {
975 istate->cache_alloc = alloc_nr(istate->cache_alloc);
976 istate->cache = xrealloc(istate->cache,
977 istate->cache_alloc * sizeof(struct cache_entry *));
Linus Torvalds197ee8c2005-04-09 12:09:27 -0700978 }
979
980 /* Add it in.. */
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700981 istate->cache_nr++;
Junio C Hamanoaf3785d2007-08-09 13:42:50 -0700982 if (istate->cache_nr > pos + 1)
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700983 memmove(istate->cache + pos + 1,
984 istate->cache + pos,
985 (istate->cache_nr - pos - 1) * sizeof(ce));
Linus Torvaldscf558702008-01-22 18:41:14 -0800986 set_index_entry(istate, pos, ce);
Junio C Hamano4aab5b42007-04-01 23:26:07 -0700987 istate->cache_changed = 1;
Linus Torvalds197ee8c2005-04-09 12:09:27 -0700988 return 0;
989}
990
Linus Torvalds405e5b22006-05-19 09:56:35 -0700991/*
992 * "refresh" does not calculate a new sha1 file or bring the
993 * cache up-to-date for mode/content changes. But what it
994 * _does_ do is to "re-match" the stat information of a file
995 * with the cache, so that you can refresh the cache for a
996 * file that hasn't been changed but where the stat entry is
997 * out of date.
998 *
999 * For example, you'd want to do this after doing a "git-read-tree",
1000 * to link up the stat cache details with the proper files.
1001 */
Junio C Hamano4aab5b42007-04-01 23:26:07 -07001002static struct cache_entry *refresh_cache_ent(struct index_state *istate,
Junio C Hamano4bd5b7d2007-11-10 00:15:03 -08001003 struct cache_entry *ce,
Jeff Kingd05e6972011-11-18 06:11:08 -05001004 unsigned int options, int *err,
1005 int *changed_ret)
Linus Torvalds405e5b22006-05-19 09:56:35 -07001006{
1007 struct stat st;
1008 struct cache_entry *updated;
1009 int changed, size;
Junio C Hamano4bd5b7d2007-11-10 00:15:03 -08001010 int ignore_valid = options & CE_MATCH_IGNORE_VALID;
Nguyễn Thái Ngọc Duy56cac482009-12-14 18:43:58 +07001011 int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;
Linus Torvalds405e5b22006-05-19 09:56:35 -07001012
Junio C Hamanoeadb5832008-01-18 23:45:24 -08001013 if (ce_uptodate(ce))
1014 return ce;
1015
Marius Storm-Olsenaa9349d2008-05-30 14:38:35 +02001016 /*
Nguyễn Thái Ngọc Duy56cac482009-12-14 18:43:58 +07001017 * CE_VALID or CE_SKIP_WORKTREE means the user promised us
1018 * that the change to the work tree does not matter and told
1019 * us not to worry.
Marius Storm-Olsenaa9349d2008-05-30 14:38:35 +02001020 */
Nguyễn Thái Ngọc Duy56cac482009-12-14 18:43:58 +07001021 if (!ignore_skip_worktree && ce_skip_worktree(ce)) {
1022 ce_mark_uptodate(ce);
1023 return ce;
1024 }
Marius Storm-Olsenaa9349d2008-05-30 14:38:35 +02001025 if (!ignore_valid && (ce->ce_flags & CE_VALID)) {
1026 ce_mark_uptodate(ce);
1027 return ce;
1028 }
1029
Johannes Schindelin8fd2cb42006-07-25 21:32:18 -07001030 if (lstat(ce->name, &st) < 0) {
Junio C Hamanoec0cc702007-04-01 21:34:34 -07001031 if (err)
1032 *err = errno;
Johannes Schindelin8fd2cb42006-07-25 21:32:18 -07001033 return NULL;
1034 }
Linus Torvalds405e5b22006-05-19 09:56:35 -07001035
Junio C Hamano4bd5b7d2007-11-10 00:15:03 -08001036 changed = ie_match_stat(istate, ce, &st, options);
Jeff Kingd05e6972011-11-18 06:11:08 -05001037 if (changed_ret)
1038 *changed_ret = changed;
Linus Torvalds405e5b22006-05-19 09:56:35 -07001039 if (!changed) {
Junio C Hamano4bd5b7d2007-11-10 00:15:03 -08001040 /*
1041 * The path is unchanged. If we were told to ignore
1042 * valid bit, then we did the actual stat check and
1043 * found that the entry is unmodified. If the entry
1044 * is not marked VALID, this is the place to mark it
1045 * valid again, under "assume unchanged" mode.
1046 */
1047 if (ignore_valid && assume_unchanged &&
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001048 !(ce->ce_flags & CE_VALID))
Linus Torvalds405e5b22006-05-19 09:56:35 -07001049 ; /* mark this one VALID again */
Junio C Hamanoeadb5832008-01-18 23:45:24 -08001050 else {
1051 /*
1052 * We do not mark the index itself "modified"
1053 * because CE_UPTODATE flag is in-core only;
1054 * we are not going to write this change out.
1055 */
Junio C Hamano125fd982010-01-24 00:10:20 -08001056 if (!S_ISGITLINK(ce->ce_mode))
1057 ce_mark_uptodate(ce);
Johannes Schindelin8fd2cb42006-07-25 21:32:18 -07001058 return ce;
Junio C Hamanoeadb5832008-01-18 23:45:24 -08001059 }
Linus Torvalds405e5b22006-05-19 09:56:35 -07001060 }
1061
Junio C Hamano4bd5b7d2007-11-10 00:15:03 -08001062 if (ie_modified(istate, ce, &st, options)) {
Junio C Hamanoec0cc702007-04-01 21:34:34 -07001063 if (err)
1064 *err = EINVAL;
Johannes Schindelin8fd2cb42006-07-25 21:32:18 -07001065 return NULL;
1066 }
Linus Torvalds405e5b22006-05-19 09:56:35 -07001067
1068 size = ce_size(ce);
1069 updated = xmalloc(size);
1070 memcpy(updated, ce, size);
1071 fill_stat_cache_info(updated, &st);
Junio C Hamano4bd5b7d2007-11-10 00:15:03 -08001072 /*
1073 * If ignore_valid is not set, we should leave CE_VALID bit
1074 * alone. Otherwise, paths marked with --no-assume-unchanged
1075 * (i.e. things to be edited) will reacquire CE_VALID bit
1076 * automatically, which is not really what we want.
Linus Torvalds405e5b22006-05-19 09:56:35 -07001077 */
Junio C Hamano4bd5b7d2007-11-10 00:15:03 -08001078 if (!ignore_valid && assume_unchanged &&
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001079 !(ce->ce_flags & CE_VALID))
1080 updated->ce_flags &= ~CE_VALID;
Linus Torvalds405e5b22006-05-19 09:56:35 -07001081
1082 return updated;
1083}
1084
Matthieu Moy3deffc52009-08-21 10:57:59 +02001085static void show_file(const char * fmt, const char * name, int in_porcelain,
Jonathan Nieder046613c2011-02-22 22:43:23 +00001086 int * first, const char *header_msg)
Matthieu Moy3deffc52009-08-21 10:57:59 +02001087{
1088 if (in_porcelain && *first && header_msg) {
1089 printf("%s\n", header_msg);
Junio C Hamanocd2b8ae2011-08-25 14:46:52 -07001090 *first = 0;
Matthieu Moy3deffc52009-08-21 10:57:59 +02001091 }
1092 printf(fmt, name);
1093}
1094
1095int refresh_index(struct index_state *istate, unsigned int flags, const char **pathspec,
Jonathan Nieder046613c2011-02-22 22:43:23 +00001096 char *seen, const char *header_msg)
Linus Torvalds405e5b22006-05-19 09:56:35 -07001097{
1098 int i;
1099 int has_errors = 0;
1100 int really = (flags & REFRESH_REALLY) != 0;
1101 int allow_unmerged = (flags & REFRESH_UNMERGED) != 0;
1102 int quiet = (flags & REFRESH_QUIET) != 0;
1103 int not_new = (flags & REFRESH_IGNORE_MISSING) != 0;
Johannes Schindelin5fdeacb2008-05-14 18:03:45 +01001104 int ignore_submodules = (flags & REFRESH_IGNORE_SUBMODULES) != 0;
Matthieu Moy3deffc52009-08-21 10:57:59 +02001105 int first = 1;
1106 int in_porcelain = (flags & REFRESH_IN_PORCELAIN);
Junio C Hamano4bd5b7d2007-11-10 00:15:03 -08001107 unsigned int options = really ? CE_MATCH_IGNORE_VALID : 0;
Jeff King4bd4e732011-11-18 06:11:28 -05001108 const char *modified_fmt;
Jeff King73b7eae2011-11-18 06:13:08 -05001109 const char *deleted_fmt;
1110 const char *typechange_fmt;
1111 const char *added_fmt;
Jeff King4bd4e732011-11-18 06:11:28 -05001112 const char *unmerged_fmt;
Linus Torvalds405e5b22006-05-19 09:56:35 -07001113
Jeff King4bd4e732011-11-18 06:11:28 -05001114 modified_fmt = (in_porcelain ? "M\t%s\n" : "%s: needs update\n");
Jeff King73b7eae2011-11-18 06:13:08 -05001115 deleted_fmt = (in_porcelain ? "D\t%s\n" : "%s: needs update\n");
1116 typechange_fmt = (in_porcelain ? "T\t%s\n" : "%s needs update\n");
1117 added_fmt = (in_porcelain ? "A\t%s\n" : "%s needs update\n");
Jeff King4bd4e732011-11-18 06:11:28 -05001118 unmerged_fmt = (in_porcelain ? "U\t%s\n" : "%s: needs merge\n");
Junio C Hamano4aab5b42007-04-01 23:26:07 -07001119 for (i = 0; i < istate->cache_nr; i++) {
Linus Torvalds405e5b22006-05-19 09:56:35 -07001120 struct cache_entry *ce, *new;
Junio C Hamanoec0cc702007-04-01 21:34:34 -07001121 int cache_errno = 0;
Jeff King73b7eae2011-11-18 06:13:08 -05001122 int changed = 0;
Junio C Hamanoec0cc702007-04-01 21:34:34 -07001123
Junio C Hamano4aab5b42007-04-01 23:26:07 -07001124 ce = istate->cache[i];
Johannes Schindelin5fdeacb2008-05-14 18:03:45 +01001125 if (ignore_submodules && S_ISGITLINK(ce->ce_mode))
1126 continue;
1127
Linus Torvalds405e5b22006-05-19 09:56:35 -07001128 if (ce_stage(ce)) {
Junio C Hamano4aab5b42007-04-01 23:26:07 -07001129 while ((i < istate->cache_nr) &&
1130 ! strcmp(istate->cache[i]->name, ce->name))
Linus Torvalds405e5b22006-05-19 09:56:35 -07001131 i++;
1132 i--;
1133 if (allow_unmerged)
1134 continue;
Jeff King4bd4e732011-11-18 06:11:28 -05001135 show_file(unmerged_fmt, ce->name, in_porcelain, &first, header_msg);
Linus Torvalds405e5b22006-05-19 09:56:35 -07001136 has_errors = 1;
1137 continue;
1138 }
1139
Alexandre Julliardd6168132007-08-11 23:59:01 +02001140 if (pathspec && !match_pathspec(pathspec, ce->name, strlen(ce->name), 0, seen))
1141 continue;
1142
Jeff King73b7eae2011-11-18 06:13:08 -05001143 new = refresh_cache_ent(istate, ce, options, &cache_errno, &changed);
Johannes Schindelin8fd2cb42006-07-25 21:32:18 -07001144 if (new == ce)
Linus Torvalds405e5b22006-05-19 09:56:35 -07001145 continue;
Johannes Schindelin8fd2cb42006-07-25 21:32:18 -07001146 if (!new) {
Jeff King73b7eae2011-11-18 06:13:08 -05001147 const char *fmt;
1148
Johannes Schindelin8fd2cb42006-07-25 21:32:18 -07001149 if (not_new && cache_errno == ENOENT)
Linus Torvalds405e5b22006-05-19 09:56:35 -07001150 continue;
Johannes Schindelin8fd2cb42006-07-25 21:32:18 -07001151 if (really && cache_errno == EINVAL) {
Linus Torvalds405e5b22006-05-19 09:56:35 -07001152 /* If we are doing --really-refresh that
1153 * means the index is not valid anymore.
1154 */
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001155 ce->ce_flags &= ~CE_VALID;
Junio C Hamano4aab5b42007-04-01 23:26:07 -07001156 istate->cache_changed = 1;
Linus Torvalds405e5b22006-05-19 09:56:35 -07001157 }
1158 if (quiet)
1159 continue;
Jeff King73b7eae2011-11-18 06:13:08 -05001160
1161 if (cache_errno == ENOENT)
1162 fmt = deleted_fmt;
1163 else if (ce->ce_flags & CE_INTENT_TO_ADD)
1164 fmt = added_fmt; /* must be before other checks */
1165 else if (changed & TYPE_CHANGED)
1166 fmt = typechange_fmt;
1167 else
1168 fmt = modified_fmt;
1169 show_file(fmt,
1170 ce->name, in_porcelain, &first, header_msg);
Linus Torvalds405e5b22006-05-19 09:56:35 -07001171 has_errors = 1;
1172 continue;
1173 }
Linus Torvaldscf558702008-01-22 18:41:14 -08001174
1175 replace_index_entry(istate, i, new);
Linus Torvalds405e5b22006-05-19 09:56:35 -07001176 }
1177 return has_errors;
1178}
1179
Junio C Hamano87b29e52010-01-11 22:29:35 -08001180static struct cache_entry *refresh_cache_entry(struct cache_entry *ce, int really)
Junio C Hamanoec0cc702007-04-01 21:34:34 -07001181{
Jeff Kingd05e6972011-11-18 06:11:08 -05001182 return refresh_cache_ent(&the_index, ce, really, NULL, NULL);
Junio C Hamanoec0cc702007-04-01 21:34:34 -07001183}
1184
Junio C Hamanobad68ec2006-04-24 21:18:58 -07001185static int verify_hdr(struct cache_header *hdr, unsigned long size)
Linus Torvaldse83c5162005-04-07 15:13:13 -07001186{
Nicolas Pitre9126f002008-10-01 14:05:20 -04001187 git_SHA_CTX c;
Junio C Hamanobad68ec2006-04-24 21:18:58 -07001188 unsigned char sha1[20];
Linus Torvaldse83c5162005-04-07 15:13:13 -07001189
Linus Torvaldsccc4feb2005-04-15 10:44:27 -07001190 if (hdr->hdr_signature != htonl(CACHE_SIGNATURE))
Linus Torvaldse83c5162005-04-07 15:13:13 -07001191 return error("bad signature");
Nguyễn Thái Ngọc Duy06aaaa02008-10-01 11:04:01 +07001192 if (hdr->hdr_version != htonl(2) && hdr->hdr_version != htonl(3))
Linus Torvaldsca9be052005-04-20 12:36:41 -07001193 return error("bad index version");
Nicolas Pitre9126f002008-10-01 14:05:20 -04001194 git_SHA1_Init(&c);
1195 git_SHA1_Update(&c, hdr, size - 20);
1196 git_SHA1_Final(sha1, &c);
David Rientjesa89fccd2006-08-17 11:54:57 -07001197 if (hashcmp(sha1, (unsigned char *)hdr + size - 20))
Linus Torvaldsca9be052005-04-20 12:36:41 -07001198 return error("bad index file sha1 signature");
Linus Torvaldse83c5162005-04-07 15:13:13 -07001199 return 0;
1200}
1201
Junio C Hamano4aab5b42007-04-01 23:26:07 -07001202static int read_index_extension(struct index_state *istate,
1203 const char *ext, void *data, unsigned long sz)
Junio C Hamanobad68ec2006-04-24 21:18:58 -07001204{
1205 switch (CACHE_EXT(ext)) {
1206 case CACHE_EXT_TREE:
Junio C Hamano4aab5b42007-04-01 23:26:07 -07001207 istate->cache_tree = cache_tree_read(data, sz);
Junio C Hamanobad68ec2006-04-24 21:18:58 -07001208 break;
Junio C Hamanocfc57892009-12-25 00:30:51 -08001209 case CACHE_EXT_RESOLVE_UNDO:
1210 istate->resolve_undo = resolve_undo_read(data, sz);
1211 break;
Junio C Hamanobad68ec2006-04-24 21:18:58 -07001212 default:
1213 if (*ext < 'A' || 'Z' < *ext)
1214 return error("index uses %.4s extension, which we do not understand",
1215 ext);
1216 fprintf(stderr, "ignoring %.4s extension\n", ext);
1217 break;
1218 }
1219 return 0;
1220}
1221
Junio C Hamano4aab5b42007-04-01 23:26:07 -07001222int read_index(struct index_state *istate)
Linus Torvaldse83c5162005-04-07 15:13:13 -07001223{
Junio C Hamano4aab5b42007-04-01 23:26:07 -07001224 return read_index_from(istate, get_index_file());
Johannes Schindelin8fd2cb42006-07-25 21:32:18 -07001225}
1226
René Scharfedebed2a2011-10-24 23:59:14 +02001227static struct cache_entry *create_from_disk(struct ondisk_cache_entry *ondisk)
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001228{
René Scharfedebed2a2011-10-24 23:59:14 +02001229 struct cache_entry *ce;
Junio C Hamano7fec10b2008-01-18 23:42:00 -08001230 size_t len;
Nguyễn Thái Ngọc Duy06aaaa02008-10-01 11:04:01 +07001231 const char *name;
René Scharfedebed2a2011-10-24 23:59:14 +02001232 unsigned int flags;
1233
1234 /* On-disk flags are just 16 bits */
1235 flags = ntohs(ondisk->flags);
1236 len = flags & CE_NAMEMASK;
1237
1238 if (flags & CE_EXTENDED) {
1239 struct ondisk_cache_entry_extended *ondisk2;
1240 int extended_flags;
1241 ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;
1242 extended_flags = ntohs(ondisk2->flags2) << 16;
1243 /* We do not yet understand any bit out of CE_EXTENDED_FLAGS */
1244 if (extended_flags & ~CE_EXTENDED_FLAGS)
1245 die("Unknown index entry format %08x", extended_flags);
1246 flags |= extended_flags;
1247 name = ondisk2->name;
1248 }
1249 else
1250 name = ondisk->name;
1251
1252 if (len == CE_NAMEMASK)
1253 len = strlen(name);
1254
1255 ce = xmalloc(cache_entry_size(len));
Junio C Hamano7fec10b2008-01-18 23:42:00 -08001256
Kjetil Barvikfba2f382009-02-19 21:08:29 +01001257 ce->ce_ctime.sec = ntohl(ondisk->ctime.sec);
1258 ce->ce_mtime.sec = ntohl(ondisk->mtime.sec);
Kjetil Barvikfba2f382009-02-19 21:08:29 +01001259 ce->ce_ctime.nsec = ntohl(ondisk->ctime.nsec);
1260 ce->ce_mtime.nsec = ntohl(ondisk->mtime.nsec);
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001261 ce->ce_dev = ntohl(ondisk->dev);
1262 ce->ce_ino = ntohl(ondisk->ino);
1263 ce->ce_mode = ntohl(ondisk->mode);
1264 ce->ce_uid = ntohl(ondisk->uid);
1265 ce->ce_gid = ntohl(ondisk->gid);
1266 ce->ce_size = ntohl(ondisk->size);
René Scharfedebed2a2011-10-24 23:59:14 +02001267 ce->ce_flags = flags;
Junio C Hamano16ce2e42008-08-16 23:02:08 -07001268
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001269 hashcpy(ce->sha1, ondisk->sha1);
Junio C Hamano7fec10b2008-01-18 23:42:00 -08001270
René Scharfedebed2a2011-10-24 23:59:14 +02001271 memcpy(ce->name, name, len);
1272 ce->name[len] = '\0';
1273 return ce;
Linus Torvaldscf558702008-01-22 18:41:14 -08001274}
1275
Johannes Schindelin8fd2cb42006-07-25 21:32:18 -07001276/* remember to discard_cache() before reading a different cache! */
Junio C Hamano4aab5b42007-04-01 23:26:07 -07001277int read_index_from(struct index_state *istate, const char *path)
Johannes Schindelin8fd2cb42006-07-25 21:32:18 -07001278{
Linus Torvaldse83c5162005-04-07 15:13:13 -07001279 int fd, i;
1280 struct stat st;
René Scharfedebed2a2011-10-24 23:59:14 +02001281 unsigned long src_offset;
Linus Torvaldse83c5162005-04-07 15:13:13 -07001282 struct cache_header *hdr;
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001283 void *mmap;
1284 size_t mmap_size;
Linus Torvaldse83c5162005-04-07 15:13:13 -07001285
1286 errno = EBUSY;
Junio C Hamano913e0e92008-08-23 12:57:30 -07001287 if (istate->initialized)
Junio C Hamano4aab5b42007-04-01 23:26:07 -07001288 return istate->cache_nr;
Linus Torvalds5d1a5c02005-10-01 13:24:27 -07001289
Linus Torvaldse83c5162005-04-07 15:13:13 -07001290 errno = ENOENT;
Kjetil Barvikfba2f382009-02-19 21:08:29 +01001291 istate->timestamp.sec = 0;
1292 istate->timestamp.nsec = 0;
Johannes Schindelin8fd2cb42006-07-25 21:32:18 -07001293 fd = open(path, O_RDONLY);
Linus Torvalds5d1a5c02005-10-01 13:24:27 -07001294 if (fd < 0) {
1295 if (errno == ENOENT)
1296 return 0;
Thomas Rastd824cbb2009-06-27 17:58:46 +02001297 die_errno("index file open failed");
Linus Torvalds5d1a5c02005-10-01 13:24:27 -07001298 }
Linus Torvaldse83c5162005-04-07 15:13:13 -07001299
Luiz Fernando N. Capitulino3511a372007-04-25 11:18:17 -03001300 if (fstat(fd, &st))
Thomas Rastd824cbb2009-06-27 17:58:46 +02001301 die_errno("cannot stat the open index");
Luiz Fernando N. Capitulino3511a372007-04-25 11:18:17 -03001302
1303 errno = EINVAL;
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001304 mmap_size = xsize_t(st.st_size);
1305 if (mmap_size < sizeof(struct cache_header) + 20)
Luiz Fernando N. Capitulino3511a372007-04-25 11:18:17 -03001306 die("index file smaller than expected");
1307
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001308 mmap = xmmap(NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
Linus Torvaldse83c5162005-04-07 15:13:13 -07001309 close(fd);
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001310 if (mmap == MAP_FAILED)
Thomas Rast0721c312009-06-27 17:58:47 +02001311 die_errno("unable to map index file");
Linus Torvaldse83c5162005-04-07 15:13:13 -07001312
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001313 hdr = mmap;
1314 if (verify_hdr(hdr, mmap_size) < 0)
Linus Torvaldse83c5162005-04-07 15:13:13 -07001315 goto unmap;
1316
Junio C Hamano4aab5b42007-04-01 23:26:07 -07001317 istate->cache_nr = ntohl(hdr->hdr_entries);
1318 istate->cache_alloc = alloc_nr(istate->cache_nr);
1319 istate->cache = xcalloc(istate->cache_alloc, sizeof(struct cache_entry *));
Junio C Hamano913e0e92008-08-23 12:57:30 -07001320 istate->initialized = 1;
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001321
1322 src_offset = sizeof(*hdr);
Junio C Hamano4aab5b42007-04-01 23:26:07 -07001323 for (i = 0; i < istate->cache_nr; i++) {
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001324 struct ondisk_cache_entry *disk_ce;
Junio C Hamano4aab5b42007-04-01 23:26:07 -07001325 struct cache_entry *ce;
1326
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001327 disk_ce = (struct ondisk_cache_entry *)((char *)mmap + src_offset);
René Scharfedebed2a2011-10-24 23:59:14 +02001328 ce = create_from_disk(disk_ce);
Linus Torvaldscf558702008-01-22 18:41:14 -08001329 set_index_entry(istate, i, ce);
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001330
1331 src_offset += ondisk_ce_size(ce);
Linus Torvaldse83c5162005-04-07 15:13:13 -07001332 }
Kjetil Barvikfba2f382009-02-19 21:08:29 +01001333 istate->timestamp.sec = st.st_mtime;
Kjetil Barvikc06ff492009-03-04 18:47:40 +01001334 istate->timestamp.nsec = ST_MTIME_NSEC(st);
Kjetil Barvikfba2f382009-02-19 21:08:29 +01001335
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001336 while (src_offset <= mmap_size - 20 - 8) {
Junio C Hamanobad68ec2006-04-24 21:18:58 -07001337 /* After an array of active_nr index entries,
1338 * there can be arbitrary number of extended
1339 * sections, each of which is prefixed with
1340 * extension name (4-byte) and section length
1341 * in 4-byte network byte order.
1342 */
Nathaniel W Filardo07cc8ec2009-12-27 01:11:21 -05001343 uint32_t extsize;
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001344 memcpy(&extsize, (char *)mmap + src_offset + 4, 4);
Junio C Hamanobad68ec2006-04-24 21:18:58 -07001345 extsize = ntohl(extsize);
Junio C Hamano4aab5b42007-04-01 23:26:07 -07001346 if (read_index_extension(istate,
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001347 (const char *) mmap + src_offset,
1348 (char *) mmap + src_offset + 8,
Florian Forster1d7f1712006-06-18 17:18:09 +02001349 extsize) < 0)
Junio C Hamanobad68ec2006-04-24 21:18:58 -07001350 goto unmap;
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001351 src_offset += 8;
1352 src_offset += extsize;
Junio C Hamanobad68ec2006-04-24 21:18:58 -07001353 }
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001354 munmap(mmap, mmap_size);
Junio C Hamano4aab5b42007-04-01 23:26:07 -07001355 return istate->cache_nr;
Linus Torvaldse83c5162005-04-07 15:13:13 -07001356
1357unmap:
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001358 munmap(mmap, mmap_size);
Linus Torvaldse83c5162005-04-07 15:13:13 -07001359 errno = EINVAL;
Linus Torvalds5d1a5c02005-10-01 13:24:27 -07001360 die("index file corrupt");
Linus Torvaldse83c5162005-04-07 15:13:13 -07001361}
1362
Junio C Hamanofa7b3c22008-11-12 11:52:35 -08001363int is_index_unborn(struct index_state *istate)
1364{
René Scharfedebed2a2011-10-24 23:59:14 +02001365 return (!istate->cache_nr && !istate->timestamp.sec);
Junio C Hamanofa7b3c22008-11-12 11:52:35 -08001366}
1367
Junio C Hamano4aab5b42007-04-01 23:26:07 -07001368int discard_index(struct index_state *istate)
Johannes Schindelin6d297f82006-07-08 18:42:41 +02001369{
René Scharfedebed2a2011-10-24 23:59:14 +02001370 int i;
1371
1372 for (i = 0; i < istate->cache_nr; i++)
1373 free(istate->cache[i]);
Junio C Hamanocfc57892009-12-25 00:30:51 -08001374 resolve_undo_clear_index(istate);
Junio C Hamano4aab5b42007-04-01 23:26:07 -07001375 istate->cache_nr = 0;
1376 istate->cache_changed = 0;
Kjetil Barvikfba2f382009-02-19 21:08:29 +01001377 istate->timestamp.sec = 0;
1378 istate->timestamp.nsec = 0;
Junio C Hamano64ca23a2008-08-23 13:05:10 -07001379 istate->name_hash_initialized = 0;
Linus Torvaldscf558702008-01-22 18:41:14 -08001380 free_hash(&istate->name_hash);
Junio C Hamano4aab5b42007-04-01 23:26:07 -07001381 cache_tree_free(&(istate->cache_tree));
Junio C Hamano913e0e92008-08-23 12:57:30 -07001382 istate->initialized = 0;
Johannes Schindelin6d297f82006-07-08 18:42:41 +02001383
1384 /* no need to throw away allocated active_cache */
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001385 return 0;
Johannes Schindelin6d297f82006-07-08 18:42:41 +02001386}
1387
Linus Torvaldsd1f128b2008-03-06 12:46:09 -08001388int unmerged_index(const struct index_state *istate)
Daniel Barkalow94a57282008-02-07 11:40:13 -05001389{
1390 int i;
1391 for (i = 0; i < istate->cache_nr; i++) {
1392 if (ce_stage(istate->cache[i]))
1393 return 1;
1394 }
1395 return 0;
1396}
1397
Linus Torvalds4990aad2005-04-20 12:16:57 -07001398#define WRITE_BUFFER_SIZE 8192
Brian Gerstbf0f9102005-05-18 08:14:09 -04001399static unsigned char write_buffer[WRITE_BUFFER_SIZE];
Linus Torvalds4990aad2005-04-20 12:16:57 -07001400static unsigned long write_buffer_len;
1401
Nicolas Pitre9126f002008-10-01 14:05:20 -04001402static int ce_write_flush(git_SHA_CTX *context, int fd)
Junio C Hamano6015c282006-08-08 14:47:32 -07001403{
1404 unsigned int buffered = write_buffer_len;
1405 if (buffered) {
Nicolas Pitre9126f002008-10-01 14:05:20 -04001406 git_SHA1_Update(context, write_buffer, buffered);
Andy Whitcroft93822c22007-01-08 15:58:23 +00001407 if (write_in_full(fd, write_buffer, buffered) != buffered)
Junio C Hamano6015c282006-08-08 14:47:32 -07001408 return -1;
1409 write_buffer_len = 0;
1410 }
1411 return 0;
1412}
1413
Nicolas Pitre9126f002008-10-01 14:05:20 -04001414static int ce_write(git_SHA_CTX *context, int fd, void *data, unsigned int len)
Linus Torvalds4990aad2005-04-20 12:16:57 -07001415{
1416 while (len) {
1417 unsigned int buffered = write_buffer_len;
1418 unsigned int partial = WRITE_BUFFER_SIZE - buffered;
1419 if (partial > len)
1420 partial = len;
1421 memcpy(write_buffer + buffered, data, partial);
1422 buffered += partial;
1423 if (buffered == WRITE_BUFFER_SIZE) {
Junio C Hamano6015c282006-08-08 14:47:32 -07001424 write_buffer_len = buffered;
1425 if (ce_write_flush(context, fd))
Linus Torvalds4990aad2005-04-20 12:16:57 -07001426 return -1;
1427 buffered = 0;
1428 }
1429 write_buffer_len = buffered;
1430 len -= partial;
Florian Forster1d7f1712006-06-18 17:18:09 +02001431 data = (char *) data + partial;
Junio C Hamanoa6080a02007-06-07 00:04:01 -07001432 }
1433 return 0;
Linus Torvalds4990aad2005-04-20 12:16:57 -07001434}
1435
Nicolas Pitre9126f002008-10-01 14:05:20 -04001436static int write_index_ext_header(git_SHA_CTX *context, int fd,
Dennis Stosbergac58c7b2006-05-28 21:08:08 +02001437 unsigned int ext, unsigned int sz)
Junio C Hamanobad68ec2006-04-24 21:18:58 -07001438{
1439 ext = htonl(ext);
1440 sz = htonl(sz);
David Rientjes968a1d62006-08-14 13:38:14 -07001441 return ((ce_write(context, fd, &ext, 4) < 0) ||
1442 (ce_write(context, fd, &sz, 4) < 0)) ? -1 : 0;
Junio C Hamanobad68ec2006-04-24 21:18:58 -07001443}
1444
Nicolas Pitre9126f002008-10-01 14:05:20 -04001445static int ce_flush(git_SHA_CTX *context, int fd)
Linus Torvalds4990aad2005-04-20 12:16:57 -07001446{
1447 unsigned int left = write_buffer_len;
Linus Torvaldsca9be052005-04-20 12:36:41 -07001448
Linus Torvalds4990aad2005-04-20 12:16:57 -07001449 if (left) {
1450 write_buffer_len = 0;
Nicolas Pitre9126f002008-10-01 14:05:20 -04001451 git_SHA1_Update(context, write_buffer, left);
Linus Torvalds4990aad2005-04-20 12:16:57 -07001452 }
Linus Torvaldsca9be052005-04-20 12:36:41 -07001453
Qingning Huo2c865d92005-09-11 14:27:47 +01001454 /* Flush first if not enough space for SHA1 signature */
1455 if (left + 20 > WRITE_BUFFER_SIZE) {
Andy Whitcroft93822c22007-01-08 15:58:23 +00001456 if (write_in_full(fd, write_buffer, left) != left)
Qingning Huo2c865d92005-09-11 14:27:47 +01001457 return -1;
1458 left = 0;
1459 }
1460
Linus Torvaldsca9be052005-04-20 12:36:41 -07001461 /* Append the SHA1 signature at the end */
Nicolas Pitre9126f002008-10-01 14:05:20 -04001462 git_SHA1_Final(write_buffer + left, context);
Linus Torvaldsca9be052005-04-20 12:36:41 -07001463 left += 20;
Andy Whitcroft93822c22007-01-08 15:58:23 +00001464 return (write_in_full(fd, write_buffer, left) != left) ? -1 : 0;
Linus Torvalds4990aad2005-04-20 12:16:57 -07001465}
1466
Junio C Hamano407c8eb2005-12-20 12:12:18 -08001467static void ce_smudge_racily_clean_entry(struct cache_entry *ce)
1468{
1469 /*
1470 * The only thing we care about in this function is to smudge the
1471 * falsely clean entry due to touch-update-touch race, so we leave
1472 * everything else as they are. We are called for entries whose
1473 * ce_mtime match the index file mtime.
Junio C Hamanoc70115b2008-07-29 01:13:44 -07001474 *
1475 * Note that this actually does not do much for gitlinks, for
1476 * which ce_match_stat_basic() always goes to the actual
1477 * contents. The caller checks with is_racy_timestamp() which
1478 * always says "no" for gitlinks, so we are not called for them ;-)
Junio C Hamano407c8eb2005-12-20 12:12:18 -08001479 */
1480 struct stat st;
1481
1482 if (lstat(ce->name, &st) < 0)
1483 return;
1484 if (ce_match_stat_basic(ce, &st))
1485 return;
1486 if (ce_modified_check_fs(ce, &st)) {
Junio C Hamano4b3511b2005-12-20 14:18:47 -08001487 /* This is "racily clean"; smudge it. Note that this
1488 * is a tricky code. At first glance, it may appear
1489 * that it can break with this sequence:
1490 *
1491 * $ echo xyzzy >frotz
1492 * $ git-update-index --add frotz
1493 * $ : >frotz
1494 * $ sleep 3
1495 * $ echo filfre >nitfol
1496 * $ git-update-index --add nitfol
1497 *
Junio C Hamanob7e58b12006-08-05 04:16:02 -07001498 * but it does not. When the second update-index runs,
Junio C Hamano4b3511b2005-12-20 14:18:47 -08001499 * it notices that the entry "frotz" has the same timestamp
1500 * as index, and if we were to smudge it by resetting its
1501 * size to zero here, then the object name recorded
1502 * in index is the 6-byte file but the cached stat information
1503 * becomes zero --- which would then match what we would
Junio C Hamanoa6080a02007-06-07 00:04:01 -07001504 * obtain from the filesystem next time we stat("frotz").
Junio C Hamano4b3511b2005-12-20 14:18:47 -08001505 *
1506 * However, the second update-index, before calling
1507 * this function, notices that the cached size is 6
1508 * bytes and what is on the filesystem is an empty
1509 * file, and never calls us, so the cached size information
1510 * for "frotz" stays 6 which does not match the filesystem.
1511 */
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001512 ce->ce_size = 0;
Junio C Hamano407c8eb2005-12-20 12:12:18 -08001513 }
1514}
1515
Nicolas Pitre9126f002008-10-01 14:05:20 -04001516static int ce_write_entry(git_SHA_CTX *c, int fd, struct cache_entry *ce)
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001517{
1518 int size = ondisk_ce_size(ce);
1519 struct ondisk_cache_entry *ondisk = xcalloc(1, size);
Nguyễn Thái Ngọc Duy06aaaa02008-10-01 11:04:01 +07001520 char *name;
Jonathan Nieder59efba62010-08-09 22:28:07 -05001521 int result;
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001522
Kjetil Barvikfba2f382009-02-19 21:08:29 +01001523 ondisk->ctime.sec = htonl(ce->ce_ctime.sec);
1524 ondisk->mtime.sec = htonl(ce->ce_mtime.sec);
Kjetil Barvikfba2f382009-02-19 21:08:29 +01001525 ondisk->ctime.nsec = htonl(ce->ce_ctime.nsec);
1526 ondisk->mtime.nsec = htonl(ce->ce_mtime.nsec);
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001527 ondisk->dev = htonl(ce->ce_dev);
1528 ondisk->ino = htonl(ce->ce_ino);
1529 ondisk->mode = htonl(ce->ce_mode);
1530 ondisk->uid = htonl(ce->ce_uid);
1531 ondisk->gid = htonl(ce->ce_gid);
1532 ondisk->size = htonl(ce->ce_size);
1533 hashcpy(ondisk->sha1, ce->sha1);
1534 ondisk->flags = htons(ce->ce_flags);
Nguyễn Thái Ngọc Duy06aaaa02008-10-01 11:04:01 +07001535 if (ce->ce_flags & CE_EXTENDED) {
1536 struct ondisk_cache_entry_extended *ondisk2;
1537 ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;
1538 ondisk2->flags2 = htons((ce->ce_flags & CE_EXTENDED_FLAGS) >> 16);
1539 name = ondisk2->name;
1540 }
1541 else
1542 name = ondisk->name;
1543 memcpy(name, ce->name, ce_namelen(ce));
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001544
Jonathan Nieder59efba62010-08-09 22:28:07 -05001545 result = ce_write(c, fd, ondisk, size);
1546 free(ondisk);
1547 return result;
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001548}
1549
Junio C Hamano483fbe22011-03-21 10:18:19 -07001550static int has_racy_timestamp(struct index_state *istate)
1551{
1552 int entries = istate->cache_nr;
1553 int i;
1554
1555 for (i = 0; i < entries; i++) {
1556 struct cache_entry *ce = istate->cache[i];
1557 if (is_racy_timestamp(istate, ce))
1558 return 1;
1559 }
1560 return 0;
1561}
1562
Junio C Hamanoccdc4ec2011-03-21 10:16:10 -07001563/*
1564 * Opportunisticly update the index but do not complain if we can't
1565 */
1566void update_index_if_able(struct index_state *istate, struct lock_file *lockfile)
1567{
Junio C Hamano483fbe22011-03-21 10:18:19 -07001568 if ((istate->cache_changed || has_racy_timestamp(istate)) &&
Junio C Hamanoccdc4ec2011-03-21 10:16:10 -07001569 !write_index(istate, lockfile->fd))
1570 commit_locked_index(lockfile);
1571 else
1572 rollback_lock_file(lockfile);
1573}
1574
Kjetil Barvike1afca42009-02-23 19:02:57 +01001575int write_index(struct index_state *istate, int newfd)
Linus Torvalds197ee8c2005-04-09 12:09:27 -07001576{
Nicolas Pitre9126f002008-10-01 14:05:20 -04001577 git_SHA_CTX c;
Linus Torvalds197ee8c2005-04-09 12:09:27 -07001578 struct cache_header hdr;
Nguyễn Thái Ngọc Duy06aaaa02008-10-01 11:04:01 +07001579 int i, err, removed, extended;
Junio C Hamano4aab5b42007-04-01 23:26:07 -07001580 struct cache_entry **cache = istate->cache;
1581 int entries = istate->cache_nr;
Kjetil Barvike1afca42009-02-23 19:02:57 +01001582 struct stat st;
Junio C Hamano025a0702005-06-10 01:32:37 -07001583
Nguyễn Thái Ngọc Duy06aaaa02008-10-01 11:04:01 +07001584 for (i = removed = extended = 0; i < entries; i++) {
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001585 if (cache[i]->ce_flags & CE_REMOVE)
Junio C Hamano025a0702005-06-10 01:32:37 -07001586 removed++;
Linus Torvalds197ee8c2005-04-09 12:09:27 -07001587
Nguyễn Thái Ngọc Duy06aaaa02008-10-01 11:04:01 +07001588 /* reduce extended entries if possible */
1589 cache[i]->ce_flags &= ~CE_EXTENDED;
1590 if (cache[i]->ce_flags & CE_EXTENDED_FLAGS) {
1591 extended++;
1592 cache[i]->ce_flags |= CE_EXTENDED;
1593 }
1594 }
1595
Linus Torvaldsccc4feb2005-04-15 10:44:27 -07001596 hdr.hdr_signature = htonl(CACHE_SIGNATURE);
Nguyễn Thái Ngọc Duy06aaaa02008-10-01 11:04:01 +07001597 /* for extended format, increase version so older git won't try to read it */
1598 hdr.hdr_version = htonl(extended ? 3 : 2);
Junio C Hamano025a0702005-06-10 01:32:37 -07001599 hdr.hdr_entries = htonl(entries - removed);
Linus Torvalds197ee8c2005-04-09 12:09:27 -07001600
Nicolas Pitre9126f002008-10-01 14:05:20 -04001601 git_SHA1_Init(&c);
Linus Torvaldsca9be052005-04-20 12:36:41 -07001602 if (ce_write(&c, newfd, &hdr, sizeof(hdr)) < 0)
Linus Torvalds197ee8c2005-04-09 12:09:27 -07001603 return -1;
1604
1605 for (i = 0; i < entries; i++) {
1606 struct cache_entry *ce = cache[i];
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001607 if (ce->ce_flags & CE_REMOVE)
Linus Torvaldsaa160212005-06-09 15:34:04 -07001608 continue;
Junio C Hamanoe06c43c2008-03-30 09:25:52 -07001609 if (!ce_uptodate(ce) && is_racy_timestamp(istate, ce))
Junio C Hamano407c8eb2005-12-20 12:12:18 -08001610 ce_smudge_racily_clean_entry(ce);
Linus Torvalds7a51ed62008-01-14 16:03:17 -08001611 if (ce_write_entry(&c, newfd, ce) < 0)
Linus Torvalds197ee8c2005-04-09 12:09:27 -07001612 return -1;
1613 }
Junio C Hamano1af1c2b2006-04-23 16:52:08 -07001614
Junio C Hamanobad68ec2006-04-24 21:18:58 -07001615 /* Write extension data here */
Junio C Hamano4aab5b42007-04-01 23:26:07 -07001616 if (istate->cache_tree) {
Brandon Caseyf285a2d2008-10-09 14:12:12 -05001617 struct strbuf sb = STRBUF_INIT;
Pierre Habouzit1dffb8f2007-09-25 10:22:44 +02001618
Pierre Habouzit1dffb8f2007-09-25 10:22:44 +02001619 cache_tree_write(&sb, istate->cache_tree);
1620 err = write_index_ext_header(&c, newfd, CACHE_EXT_TREE, sb.len) < 0
1621 || ce_write(&c, newfd, sb.buf, sb.len) < 0;
1622 strbuf_release(&sb);
1623 if (err)
Junio C Hamanobad68ec2006-04-24 21:18:58 -07001624 return -1;
Junio C Hamanobad68ec2006-04-24 21:18:58 -07001625 }
Junio C Hamanocfc57892009-12-25 00:30:51 -08001626 if (istate->resolve_undo) {
1627 struct strbuf sb = STRBUF_INIT;
1628
1629 resolve_undo_write(&sb, istate->resolve_undo);
1630 err = write_index_ext_header(&c, newfd, CACHE_EXT_RESOLVE_UNDO,
1631 sb.len) < 0
1632 || ce_write(&c, newfd, sb.buf, sb.len) < 0;
1633 strbuf_release(&sb);
1634 if (err)
1635 return -1;
1636 }
Kjetil Barvike1afca42009-02-23 19:02:57 +01001637
1638 if (ce_flush(&c, newfd) || fstat(newfd, &st))
1639 return -1;
Kjetil Barvik5bcf1092009-03-15 12:38:55 +01001640 istate->timestamp.sec = (unsigned int)st.st_mtime;
1641 istate->timestamp.nsec = ST_MTIME_NSEC(st);
Kjetil Barvike1afca42009-02-23 19:02:57 +01001642 return 0;
Linus Torvalds197ee8c2005-04-09 12:09:27 -07001643}
Miklos Vajnae46bbcf2008-06-27 18:21:58 +02001644
1645/*
1646 * Read the index file that is potentially unmerged into given
Junio C Hamano63e8dc52008-12-05 17:54:11 -08001647 * index_state, dropping any unmerged entries. Returns true if
Miklos Vajnae46bbcf2008-06-27 18:21:58 +02001648 * the index is unmerged. Callers who want to refuse to work
1649 * from an unmerged state can call this and check its return value,
1650 * instead of calling read_cache().
1651 */
1652int read_index_unmerged(struct index_state *istate)
1653{
1654 int i;
Junio C Hamanod1a43f22008-10-15 16:00:06 -07001655 int unmerged = 0;
Miklos Vajnae46bbcf2008-06-27 18:21:58 +02001656
1657 read_index(istate);
Miklos Vajnae46bbcf2008-06-27 18:21:58 +02001658 for (i = 0; i < istate->cache_nr; i++) {
1659 struct cache_entry *ce = istate->cache[i];
Junio C Hamanod1a43f22008-10-15 16:00:06 -07001660 struct cache_entry *new_ce;
1661 int size, len;
1662
1663 if (!ce_stage(ce))
Miklos Vajnae46bbcf2008-06-27 18:21:58 +02001664 continue;
Junio C Hamanod1a43f22008-10-15 16:00:06 -07001665 unmerged = 1;
1666 len = strlen(ce->name);
1667 size = cache_entry_size(len);
1668 new_ce = xcalloc(1, size);
Junio C Hamanod1a43f22008-10-15 16:00:06 -07001669 memcpy(new_ce->name, ce->name, len);
Junio C Hamanoe11d7b52009-12-31 23:04:04 -08001670 new_ce->ce_flags = create_ce_flags(len, 0) | CE_CONFLICTED;
Junio C Hamanod1a43f22008-10-15 16:00:06 -07001671 new_ce->ce_mode = ce->ce_mode;
1672 if (add_index_entry(istate, new_ce, 0))
1673 return error("%s: cannot drop to stage #0",
1674 ce->name);
1675 i = index_name_pos(istate, new_ce->name, len);
Miklos Vajnae46bbcf2008-06-27 18:21:58 +02001676 }
Junio C Hamanod1a43f22008-10-15 16:00:06 -07001677 return unmerged;
Miklos Vajnae46bbcf2008-06-27 18:21:58 +02001678}
Junio C Hamano041aee32008-07-21 01:24:17 -07001679
Jeff King98fa4732008-10-16 11:07:26 -04001680/*
1681 * Returns 1 if the path is an "other" path with respect to
1682 * the index; that is, the path is not mentioned in the index at all,
1683 * either as a file, a directory with some files in the index,
1684 * or as an unmerged entry.
1685 *
1686 * We helpfully remove a trailing "/" from directories so that
1687 * the output of read_directory can be used as-is.
1688 */
1689int index_name_is_other(const struct index_state *istate, const char *name,
1690 int namelen)
1691{
1692 int pos;
1693 if (namelen && name[namelen - 1] == '/')
1694 namelen--;
1695 pos = index_name_pos(istate, name, namelen);
1696 if (0 <= pos)
1697 return 0; /* exact match */
1698 pos = -pos - 1;
1699 if (pos < istate->cache_nr) {
1700 struct cache_entry *ce = istate->cache[pos];
1701 if (ce_namelen(ce) == namelen &&
1702 !memcmp(ce->name, name, namelen))
1703 return 0; /* Yup, this one exists unmerged */
1704 }
1705 return 1;
1706}