2005-04-08 00:16:10 +02:00
|
|
|
/*
|
|
|
|
* GIT - The information manager from hell
|
|
|
|
*
|
|
|
|
* Copyright (C) Linus Torvalds, 2005
|
|
|
|
*/
|
2005-04-08 00:13:13 +02:00
|
|
|
#include "cache.h"
|
2005-09-27 03:13:08 +02:00
|
|
|
#include "strbuf.h"
|
2005-04-08 00:13:13 +02:00
|
|
|
|
2005-04-10 20:32:54 +02:00
|
|
|
/*
|
|
|
|
* Default to not allowing changes to the list of files. The
|
|
|
|
* tool doesn't actually care, but this makes it harder to add
|
|
|
|
* files to the revision control by mistake by doing something
|
2005-09-08 02:26:23 +02:00
|
|
|
* like "git-update-index *" and suddenly having all the object
|
2005-04-10 20:32:54 +02:00
|
|
|
* files be revision controlled.
|
|
|
|
*/
|
2005-10-01 22:24:27 +02:00
|
|
|
static int allow_add = 0, allow_remove = 0, allow_replace = 0, allow_unmerged = 0, not_new = 0, quiet = 0, info_only = 0;
|
2005-05-31 18:52:43 +02:00
|
|
|
static int force_remove;
|
2005-04-25 00:14:16 +02:00
|
|
|
|
|
|
|
/* Three functions to allow overloaded pointer return; see linux/err.h */
|
|
|
|
static inline void *ERR_PTR(long error)
|
|
|
|
{
|
|
|
|
return (void *) error;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline long PTR_ERR(const void *ptr)
|
|
|
|
{
|
|
|
|
return (long) ptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline long IS_ERR(const void *ptr)
|
|
|
|
{
|
|
|
|
return (unsigned long)ptr > (unsigned long)-1000L;
|
|
|
|
}
|
2005-04-10 20:32:54 +02:00
|
|
|
|
2005-09-21 09:00:47 +02:00
|
|
|
static int add_file_to_cache(const char *path)
|
2005-04-08 00:13:13 +02:00
|
|
|
{
|
2005-05-08 09:05:18 +02:00
|
|
|
int size, namelen, option, status;
|
2005-04-08 00:13:13 +02:00
|
|
|
struct cache_entry *ce;
|
|
|
|
struct stat st;
|
|
|
|
|
2005-05-08 09:05:18 +02:00
|
|
|
status = lstat(path, &st);
|
|
|
|
if (status < 0 || S_ISDIR(st.st_mode)) {
|
|
|
|
/* When we used to have "path" and now we want to add
|
|
|
|
* "path/file", we need a way to remove "path" before
|
|
|
|
* being able to add "path/file". However,
|
2005-09-08 02:26:23 +02:00
|
|
|
* "git-update-index --remove path" would not work.
|
2005-05-08 09:05:18 +02:00
|
|
|
* --force-remove can be used but this is more user
|
|
|
|
* friendly, especially since we can do the opposite
|
|
|
|
* case just fine without --force-remove.
|
|
|
|
*/
|
|
|
|
if (status == 0 || (errno == ENOENT || errno == ENOTDIR)) {
|
2005-09-18 21:09:22 +02:00
|
|
|
if (allow_remove) {
|
|
|
|
if (remove_file_from_cache(path))
|
|
|
|
return error("%s: cannot remove from the index",
|
|
|
|
path);
|
|
|
|
else
|
|
|
|
return 0;
|
|
|
|
} else if (status < 0) {
|
|
|
|
return error("%s: does not exist and --remove not passed",
|
|
|
|
path);
|
|
|
|
}
|
2005-04-10 20:32:54 +02:00
|
|
|
}
|
2005-09-01 16:13:50 +02:00
|
|
|
if (0 == status)
|
2005-09-18 21:09:22 +02:00
|
|
|
return error("%s: is a directory - add files inside instead",
|
|
|
|
path);
|
2005-09-01 16:13:50 +02:00
|
|
|
else
|
|
|
|
return error("lstat(\"%s\"): %s", path,
|
|
|
|
strerror(errno));
|
2005-04-08 00:13:13 +02:00
|
|
|
}
|
|
|
|
namelen = strlen(path);
|
|
|
|
size = cache_entry_size(namelen);
|
2005-04-26 21:00:58 +02:00
|
|
|
ce = xmalloc(size);
|
2005-04-08 00:13:13 +02:00
|
|
|
memset(ce, 0, size);
|
|
|
|
memcpy(ce->name, path, namelen);
|
2005-04-11 18:39:21 +02:00
|
|
|
fill_stat_cache_info(ce, &st);
|
2005-04-17 07:26:31 +02:00
|
|
|
ce->ce_mode = create_ce_mode(st.st_mode);
|
2005-04-16 06:45:38 +02:00
|
|
|
ce->ce_flags = htons(namelen);
|
2005-10-07 12:42:00 +02:00
|
|
|
|
|
|
|
if (index_path(ce->sha1, path, &st, !info_only))
|
|
|
|
return -1;
|
2005-05-08 06:55:21 +02:00
|
|
|
option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
|
|
|
|
option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
|
2005-09-18 21:09:22 +02:00
|
|
|
if (add_cache_entry(ce, option))
|
|
|
|
return error("%s: cannot add to the index - missing --add option?",
|
|
|
|
path);
|
|
|
|
return 0;
|
2005-04-10 20:32:54 +02:00
|
|
|
}
|
|
|
|
|
2005-04-11 18:39:21 +02:00
|
|
|
/*
|
|
|
|
* "refresh" does not calculate a new sha1 file or bring the
|
|
|
|
* cache up-to-date for mode/content changes. But what it
|
|
|
|
* _does_ do is to "re-match" the stat information of a file
|
|
|
|
* with the cache, so that you can refresh the cache for a
|
|
|
|
* file that hasn't been changed but where the stat entry is
|
|
|
|
* out of date.
|
|
|
|
*
|
2005-05-19 13:17:16 +02:00
|
|
|
* For example, you'd want to do this after doing a "git-read-tree",
|
2005-04-11 18:39:21 +02:00
|
|
|
* to link up the stat cache details with the proper files.
|
|
|
|
*/
|
|
|
|
static struct cache_entry *refresh_entry(struct cache_entry *ce)
|
|
|
|
{
|
|
|
|
struct stat st;
|
|
|
|
struct cache_entry *updated;
|
|
|
|
int changed, size;
|
|
|
|
|
2005-05-05 14:38:25 +02:00
|
|
|
if (lstat(ce->name, &st) < 0)
|
2005-04-25 00:14:16 +02:00
|
|
|
return ERR_PTR(-errno);
|
2005-04-11 18:39:21 +02:00
|
|
|
|
2005-05-15 04:04:25 +02:00
|
|
|
changed = ce_match_stat(ce, &st);
|
2005-04-11 18:39:21 +02:00
|
|
|
if (!changed)
|
2005-10-01 22:24:27 +02:00
|
|
|
return NULL;
|
2005-04-11 18:39:21 +02:00
|
|
|
|
2005-09-20 00:11:15 +02:00
|
|
|
if (ce_modified(ce, &st))
|
2005-04-25 00:14:16 +02:00
|
|
|
return ERR_PTR(-EINVAL);
|
2005-04-11 18:39:21 +02:00
|
|
|
|
|
|
|
size = ce_size(ce);
|
2005-04-26 21:00:58 +02:00
|
|
|
updated = xmalloc(size);
|
2005-04-11 18:39:21 +02:00
|
|
|
memcpy(updated, ce, size);
|
|
|
|
fill_stat_cache_info(updated, &st);
|
|
|
|
return updated;
|
2005-04-10 20:32:54 +02:00
|
|
|
}
|
|
|
|
|
2005-05-02 06:07:40 +02:00
|
|
|
static int refresh_cache(void)
|
2005-04-10 20:32:54 +02:00
|
|
|
{
|
|
|
|
int i;
|
2005-05-02 06:07:40 +02:00
|
|
|
int has_errors = 0;
|
2005-04-10 20:32:54 +02:00
|
|
|
|
2005-04-11 18:39:21 +02:00
|
|
|
for (i = 0; i < active_nr; i++) {
|
2005-04-18 19:42:48 +02:00
|
|
|
struct cache_entry *ce, *new;
|
|
|
|
ce = active_cache[i];
|
|
|
|
if (ce_stage(ce)) {
|
|
|
|
while ((i < active_nr) &&
|
|
|
|
! strcmp(active_cache[i]->name, ce->name))
|
|
|
|
i++;
|
|
|
|
i--;
|
2005-10-01 22:24:27 +02:00
|
|
|
if (allow_unmerged)
|
|
|
|
continue;
|
|
|
|
printf("%s: needs merge\n", ce->name);
|
|
|
|
has_errors = 1;
|
2005-04-18 19:42:48 +02:00
|
|
|
continue;
|
|
|
|
}
|
2005-04-11 18:39:21 +02:00
|
|
|
|
2005-04-18 19:42:48 +02:00
|
|
|
new = refresh_entry(ce);
|
2005-10-01 22:24:27 +02:00
|
|
|
if (!new)
|
|
|
|
continue;
|
2005-04-25 00:14:16 +02:00
|
|
|
if (IS_ERR(new)) {
|
2005-06-21 06:18:54 +02:00
|
|
|
if (not_new && PTR_ERR(new) == -ENOENT)
|
|
|
|
continue;
|
|
|
|
if (quiet)
|
|
|
|
continue;
|
|
|
|
printf("%s: needs update\n", ce->name);
|
|
|
|
has_errors = 1;
|
2005-04-11 18:39:21 +02:00
|
|
|
continue;
|
|
|
|
}
|
2005-05-07 01:48:43 +02:00
|
|
|
active_cache_changed = 1;
|
2005-04-17 23:34:51 +02:00
|
|
|
/* You can NOT just free active_cache[i] here, since it
|
|
|
|
* might not be necessarily malloc()ed but can also come
|
|
|
|
* from mmap(). */
|
2005-04-11 18:39:21 +02:00
|
|
|
active_cache[i] = new;
|
|
|
|
}
|
2005-05-02 06:07:40 +02:00
|
|
|
return has_errors;
|
2005-04-08 00:13:13 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We fundamentally don't like some paths: we don't want
|
2005-05-24 23:40:28 +02:00
|
|
|
* dot or dot-dot anywhere, and for obvious reasons don't
|
|
|
|
* want to recurse into ".git" either.
|
2005-04-08 00:13:13 +02:00
|
|
|
*
|
|
|
|
* Also, we don't want double slashes or slashes at the
|
2005-04-12 20:36:26 +02:00
|
|
|
* end that can make pathnames ambiguous.
|
2005-04-08 00:13:13 +02:00
|
|
|
*/
|
2005-05-24 23:40:28 +02:00
|
|
|
static int verify_dotfile(const char *rest)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* The first character was '.', but that
|
|
|
|
* has already been discarded, we now test
|
|
|
|
* the rest.
|
|
|
|
*/
|
|
|
|
switch (*rest) {
|
|
|
|
/* "." is not allowed */
|
|
|
|
case '\0': case '/':
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* ".git" followed by NUL or slash is bad. This
|
|
|
|
* shares the path end test with the ".." case.
|
|
|
|
*/
|
|
|
|
case 'g':
|
|
|
|
if (rest[1] != 'i')
|
|
|
|
break;
|
|
|
|
if (rest[2] != 't')
|
|
|
|
break;
|
|
|
|
rest += 2;
|
|
|
|
/* fallthrough */
|
|
|
|
case '.':
|
|
|
|
if (rest[1] == '\0' || rest[1] == '/')
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2005-09-21 09:00:47 +02:00
|
|
|
static int verify_path(const char *path)
|
2005-04-08 00:13:13 +02:00
|
|
|
{
|
|
|
|
char c;
|
|
|
|
|
|
|
|
goto inside;
|
|
|
|
for (;;) {
|
|
|
|
if (!c)
|
|
|
|
return 1;
|
|
|
|
if (c == '/') {
|
|
|
|
inside:
|
|
|
|
c = *path++;
|
2005-05-24 23:40:28 +02:00
|
|
|
switch (c) {
|
|
|
|
default:
|
2005-04-08 00:13:13 +02:00
|
|
|
continue;
|
2005-05-24 23:40:28 +02:00
|
|
|
case '/': case '\0':
|
|
|
|
break;
|
|
|
|
case '.':
|
|
|
|
if (verify_dotfile(path))
|
|
|
|
continue;
|
|
|
|
}
|
2005-04-08 00:13:13 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
c = *path++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-09-21 09:00:47 +02:00
|
|
|
static int add_cacheinfo(const char *arg1, const char *arg2, const char *arg3)
|
2005-04-15 20:08:33 +02:00
|
|
|
{
|
2005-05-08 06:55:21 +02:00
|
|
|
int size, len, option;
|
2005-04-15 20:08:33 +02:00
|
|
|
unsigned int mode;
|
|
|
|
unsigned char sha1[20];
|
|
|
|
struct cache_entry *ce;
|
|
|
|
|
|
|
|
if (sscanf(arg1, "%o", &mode) != 1)
|
|
|
|
return -1;
|
|
|
|
if (get_sha1_hex(arg2, sha1))
|
|
|
|
return -1;
|
|
|
|
if (!verify_path(arg3))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
len = strlen(arg3);
|
|
|
|
size = cache_entry_size(len);
|
2005-04-26 21:00:58 +02:00
|
|
|
ce = xmalloc(size);
|
2005-04-15 20:08:33 +02:00
|
|
|
memset(ce, 0, size);
|
|
|
|
|
|
|
|
memcpy(ce->sha1, sha1, 20);
|
|
|
|
memcpy(ce->name, arg3, len);
|
2005-04-16 06:45:38 +02:00
|
|
|
ce->ce_flags = htons(len);
|
2005-04-17 07:26:31 +02:00
|
|
|
ce->ce_mode = create_ce_mode(mode);
|
2005-05-08 06:55:21 +02:00
|
|
|
option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
|
|
|
|
option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
|
|
|
|
return add_cache_entry(ce, option);
|
2005-04-15 20:08:33 +02:00
|
|
|
}
|
|
|
|
|
2005-05-20 20:46:10 +02:00
|
|
|
static struct cache_file cache_file;
|
2005-04-26 20:55:42 +02:00
|
|
|
|
2005-09-27 03:13:08 +02:00
|
|
|
|
|
|
|
static void update_one(const char *path, const char *prefix, int prefix_length)
|
|
|
|
{
|
|
|
|
const char *p = prefix_path(prefix, prefix_length, path);
|
|
|
|
if (!verify_path(p)) {
|
|
|
|
fprintf(stderr, "Ignoring path %s\n", path);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (force_remove) {
|
|
|
|
if (remove_file_from_cache(p))
|
|
|
|
die("git-update-index: unable to remove %s", path);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (add_file_to_cache(p))
|
|
|
|
die("Unable to process file %s", path);
|
|
|
|
}
|
|
|
|
|
2005-09-21 09:00:47 +02:00
|
|
|
int main(int argc, const char **argv)
|
2005-04-08 00:13:13 +02:00
|
|
|
{
|
2005-09-27 03:13:08 +02:00
|
|
|
int i, newfd, entries, has_errors = 0, line_termination = '\n';
|
2005-04-10 20:32:54 +02:00
|
|
|
int allow_options = 1;
|
2005-09-27 03:13:08 +02:00
|
|
|
int read_from_stdin = 0;
|
2005-08-17 22:32:22 +02:00
|
|
|
const char *prefix = setup_git_directory();
|
2005-09-27 03:13:08 +02:00
|
|
|
int prefix_length = prefix ? strlen(prefix) : 0;
|
2005-04-21 19:55:18 +02:00
|
|
|
|
2005-05-15 23:23:12 +02:00
|
|
|
newfd = hold_index_file_for_update(&cache_file, get_index_file());
|
2005-04-12 00:39:26 +02:00
|
|
|
if (newfd < 0)
|
2005-04-13 11:28:48 +02:00
|
|
|
die("unable to create new cachefile");
|
2005-04-12 00:39:26 +02:00
|
|
|
|
2005-04-08 00:13:13 +02:00
|
|
|
entries = read_cache();
|
2005-04-12 00:39:26 +02:00
|
|
|
if (entries < 0)
|
2005-04-13 11:28:48 +02:00
|
|
|
die("cache corrupted");
|
2005-04-08 00:13:13 +02:00
|
|
|
|
|
|
|
for (i = 1 ; i < argc; i++) {
|
2005-09-21 09:00:47 +02:00
|
|
|
const char *path = argv[i];
|
2005-04-10 20:32:54 +02:00
|
|
|
|
|
|
|
if (allow_options && *path == '-') {
|
|
|
|
if (!strcmp(path, "--")) {
|
|
|
|
allow_options = 0;
|
|
|
|
continue;
|
|
|
|
}
|
2005-06-21 06:18:54 +02:00
|
|
|
if (!strcmp(path, "-q")) {
|
|
|
|
quiet = 1;
|
|
|
|
continue;
|
|
|
|
}
|
2005-04-10 20:32:54 +02:00
|
|
|
if (!strcmp(path, "--add")) {
|
|
|
|
allow_add = 1;
|
|
|
|
continue;
|
|
|
|
}
|
2005-05-08 06:55:21 +02:00
|
|
|
if (!strcmp(path, "--replace")) {
|
|
|
|
allow_replace = 1;
|
|
|
|
continue;
|
|
|
|
}
|
2005-04-10 20:32:54 +02:00
|
|
|
if (!strcmp(path, "--remove")) {
|
|
|
|
allow_remove = 1;
|
|
|
|
continue;
|
|
|
|
}
|
2005-10-01 22:24:27 +02:00
|
|
|
if (!strcmp(path, "--unmerged")) {
|
|
|
|
allow_unmerged = 1;
|
|
|
|
continue;
|
|
|
|
}
|
2005-04-10 20:32:54 +02:00
|
|
|
if (!strcmp(path, "--refresh")) {
|
2005-05-02 06:07:40 +02:00
|
|
|
has_errors |= refresh_cache();
|
2005-04-10 20:32:54 +02:00
|
|
|
continue;
|
|
|
|
}
|
2005-04-15 20:08:33 +02:00
|
|
|
if (!strcmp(path, "--cacheinfo")) {
|
2005-05-09 00:31:33 +02:00
|
|
|
if (i+3 >= argc)
|
2005-09-08 02:26:23 +02:00
|
|
|
die("git-update-index: --cacheinfo <mode> <sha1> <path>");
|
2005-05-09 00:31:33 +02:00
|
|
|
if (add_cacheinfo(argv[i+1], argv[i+2], argv[i+3]))
|
2005-09-08 02:26:23 +02:00
|
|
|
die("git-update-index: --cacheinfo cannot add %s", argv[i+3]);
|
2005-04-15 20:08:33 +02:00
|
|
|
i += 3;
|
|
|
|
continue;
|
|
|
|
}
|
2005-07-09 01:52:12 +02:00
|
|
|
if (!strcmp(path, "--info-only")) {
|
|
|
|
info_only = 1;
|
|
|
|
continue;
|
|
|
|
}
|
2005-05-02 08:50:51 +02:00
|
|
|
if (!strcmp(path, "--force-remove")) {
|
2005-05-31 18:52:43 +02:00
|
|
|
force_remove = 1;
|
2005-05-02 08:50:51 +02:00
|
|
|
continue;
|
|
|
|
}
|
2005-09-27 03:13:08 +02:00
|
|
|
if (!strcmp(path, "-z")) {
|
|
|
|
line_termination = 0;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (!strcmp(path, "--stdin")) {
|
|
|
|
if (i != argc - 1)
|
|
|
|
die("--stdin must be at the end");
|
|
|
|
read_from_stdin = 1;
|
|
|
|
break;
|
|
|
|
}
|
2005-04-25 00:14:16 +02:00
|
|
|
if (!strcmp(path, "--ignore-missing")) {
|
|
|
|
not_new = 1;
|
|
|
|
continue;
|
|
|
|
}
|
2005-04-13 11:28:48 +02:00
|
|
|
die("unknown option %s", path);
|
2005-04-10 20:32:54 +02:00
|
|
|
}
|
2005-09-27 03:13:08 +02:00
|
|
|
update_one(path, prefix, prefix_length);
|
|
|
|
}
|
|
|
|
if (read_from_stdin) {
|
|
|
|
struct strbuf buf;
|
|
|
|
strbuf_init(&buf);
|
|
|
|
while (1) {
|
|
|
|
read_line(&buf, stdin, line_termination);
|
|
|
|
if (buf.eof)
|
|
|
|
break;
|
|
|
|
update_one(buf.buf, prefix, prefix_length);
|
2005-05-31 18:52:43 +02:00
|
|
|
}
|
2005-04-08 00:13:13 +02:00
|
|
|
}
|
2005-10-01 22:39:47 +02:00
|
|
|
if (active_cache_changed) {
|
|
|
|
if (write_cache(newfd, active_cache, active_nr) ||
|
|
|
|
commit_index_file(&cache_file))
|
|
|
|
die("Unable to write new cachefile");
|
|
|
|
}
|
2005-04-12 00:39:26 +02:00
|
|
|
|
2005-05-06 00:29:06 +02:00
|
|
|
return has_errors ? 1 : 0;
|
2005-04-08 00:13:13 +02:00
|
|
|
}
|