*/
static int allow_add = 0, allow_remove = 0, not_new = 0;
+/*
+ * update-cache --refresh may not touch anything at all, in which case
+ * writing 1.6MB of the same thing is a waste.
+ */
+static int cache_changed = 0;
+
/* Three functions to allow overloaded pointer return; see linux/err.h */
static inline void *ERR_PTR(long error)
{
return (unsigned long)ptr > (unsigned long)-1000L;
}
-static int index_fd(unsigned char *sha1, int fd, struct stat *st)
-{
- z_stream stream;
- unsigned long size = st->st_size;
- int max_out_bytes = size + 200;
- void *out = malloc(max_out_bytes);
- void *metadata = malloc(200);
- int metadata_size;
- void *in;
- SHA_CTX c;
-
- in = "";
- if (size)
- in = mmap(NULL, size, PROT_READ, MAP_PRIVATE, fd, 0);
- close(fd);
- if (!out || (int)(long)in == -1)
- return -1;
-
- metadata_size = 1+sprintf(metadata, "blob %lu", size);
-
- SHA1_Init(&c);
- SHA1_Update(&c, metadata, metadata_size);
- SHA1_Update(&c, in, size);
- SHA1_Final(sha1, &c);
-
- memset(&stream, 0, sizeof(stream));
- deflateInit(&stream, Z_BEST_COMPRESSION);
-
- /*
- * ASCII size + nul byte
- */
- stream.next_in = metadata;
- stream.avail_in = metadata_size;
- stream.next_out = out;
- stream.avail_out = max_out_bytes;
- while (deflate(&stream, 0) == Z_OK)
- /* nothing */;
-
- /*
- * File content
- */
- stream.next_in = in;
- stream.avail_in = size;
- while (deflate(&stream, Z_FINISH) == Z_OK)
- /*nothing */;
-
- deflateEnd(&stream);
-
- return write_sha1_buffer(sha1, out, stream.total_out);
-}
-
/*
* This only updates the "non-critical" parts of the directory
* cache, ie the parts that aren't tracked by GIT, and only used
ce->ce_size = htonl(st->st_size);
}
-static int add_file_to_cache(char *path)
+static int add_file_to_cache_1(char *path)
{
int size, namelen;
struct cache_entry *ce;
struct stat st;
int fd;
+ unsigned int len;
+ char target[1024];
- fd = open(path, O_RDONLY);
- if (fd < 0) {
- if (errno == ENOENT) {
+ if (lstat(path, &st) < 0) {
+ if (errno == ENOENT || errno == ENOTDIR) {
if (allow_remove)
return remove_file_from_cache(path);
}
return -1;
}
- if (fstat(fd, &st) < 0) {
- close(fd);
- return -1;
- }
namelen = strlen(path);
size = cache_entry_size(namelen);
- ce = malloc(size);
+ ce = xmalloc(size);
memset(ce, 0, size);
memcpy(ce->name, path, namelen);
fill_stat_cache_info(ce, &st);
ce->ce_mode = create_ce_mode(st.st_mode);
ce->ce_flags = htons(namelen);
-
- if (index_fd(ce->sha1, fd, &st) < 0)
+ switch (st.st_mode & S_IFMT) {
+ case S_IFREG:
+ fd = open(path, O_RDONLY);
+ if (fd < 0)
+ return -1;
+ if (index_fd(ce->sha1, fd, &st) < 0)
+ return -1;
+ break;
+ case S_IFLNK:
+ len = readlink(path, target, sizeof(target));
+ if (len == -1 || len+1 > sizeof(target))
+ return -1;
+ if (write_sha1_file(target, len, "blob", ce->sha1))
+ return -1;
+ break;
+ default:
return -1;
-
+ }
+ if (!cache_changed) {
+ /* If we have not smudged the cache, be careful
+ * to keep it clean. Find out if we have a matching
+ * cache entry that add_cache_entry would replace with,
+ * and if it matches then do not bother calling it.
+ */
+ int pos = cache_name_pos(ce->name, namelen);
+ if ((0 <= pos) &&
+ !memcmp(active_cache[pos], ce, sizeof(*ce))) {
+ free(ce);
+ /* magic to tell add_file_to_cache that
+ * we have not updated anything.
+ */
+ return 999;
+ }
+ }
return add_cache_entry(ce, allow_add);
}
+static int add_file_to_cache(char *path)
+{
+ int ret = add_file_to_cache_1(path);
+ if (ret == 0)
+ cache_changed = 1;
+ else if (ret == 999)
+ ret = 0;
+ return ret;
+}
+
static int match_data(int fd, void *buffer, unsigned long size)
{
while (size) {
struct cache_entry *updated;
int changed, size;
- if (stat(ce->name, &st) < 0)
+ if (lstat(ce->name, &st) < 0)
return ERR_PTR(-errno);
changed = cache_match_stat(ce, &st);
return ce;
/*
- * If the mode has changed, there's no point in trying
+ * If the mode or type has changed, there's no point in trying
* to refresh the entry - it's not going to match
*/
- if (changed & MODE_CHANGED)
+ if (changed & (MODE_CHANGED | TYPE_CHANGED))
return ERR_PTR(-EINVAL);
if (compare_data(ce, st.st_size))
return ERR_PTR(-EINVAL);
+ cache_changed = 1;
size = ce_size(ce);
- updated = malloc(size);
+ updated = xmalloc(size);
memcpy(updated, ce, size);
fill_stat_cache_info(updated, &st);
return updated;
}
-static void refresh_cache(void)
+static int refresh_cache(void)
{
int i;
+ int has_errors = 0;
for (i = 0; i < active_nr; i++) {
struct cache_entry *ce, *new;
ce = active_cache[i];
if (ce_stage(ce)) {
printf("%s: needs merge\n", ce->name);
+ has_errors = 1;
while ((i < active_nr) &&
! strcmp(active_cache[i]->name, ce->name))
i++;
new = refresh_entry(ce);
if (IS_ERR(new)) {
- if (!(not_new && PTR_ERR(new) == -ENOENT))
+ if (!(not_new && PTR_ERR(new) == -ENOENT)) {
printf("%s: needs update\n", ce->name);
+ has_errors = 1;
+ }
continue;
}
active_cache[i] = new;
}
+ return has_errors;
}
/*
if (!verify_path(arg3))
return -1;
+ cache_changed = 1;
len = strlen(arg3);
size = cache_entry_size(len);
- ce = malloc(size);
+ ce = xmalloc(size);
memset(ce, 0, size);
memcpy(ce->sha1, sha1, 20);
int main(int argc, char **argv)
{
- int i, newfd, entries;
+ int i, newfd, entries, has_errors = 0;
int allow_options = 1;
static char lockfile[MAXPATHLEN+1];
const char *indexfile = get_index_file();
continue;
}
if (!strcmp(path, "--refresh")) {
- refresh_cache();
+ has_errors |= refresh_cache();
continue;
}
if (!strcmp(path, "--cacheinfo")) {
i += 3;
continue;
}
+ if (!strcmp(path, "--force-remove")) {
+ if (argc <= i + 1)
+ die("update-cache: --force-remove <path>");
+ if (remove_file_from_cache(argv[i+1]))
+ die("update-cache: --force-remove cannot remove %s", argv[i+1]);
+ i++;
+ continue;
+ }
+
if (!strcmp(path, "--ignore-missing")) {
not_new = 1;
continue;
if (add_file_to_cache(path))
die("Unable to add %s to database", path);
}
- if (write_cache(newfd, active_cache, active_nr) || rename(lockfile, indexfile))
+
+ if (!cache_changed)
+ unlink(lockfile);
+ else if (write_cache(newfd, active_cache, active_nr) ||
+ rename(lockfile, indexfile))
die("Unable to write new cachefile");
lockfile_name = NULL;
- return 0;
+ return has_errors ? 1 : 0;
}