diff options
Diffstat (limited to 'refs.c')
| -rw-r--r-- | refs.c | 3212 |
1 files changed, 1674 insertions, 1538 deletions
@@ -1,348 +1,304 @@ +/* + * The backend-independent part of the reference module. + */ + #include "cache.h" +#include "config.h" +#include "hashmap.h" +#include "lockfile.h" +#include "iterator.h" #include "refs.h" +#include "refs/refs-internal.h" #include "object.h" #include "tag.h" -#include "dir.h" - -/* ISSYMREF=01 and ISPACKED=02 are public interfaces */ -#define REF_KNOWS_PEELED 04 -#define REF_BROKEN 010 +#include "submodule.h" +#include "worktree.h" -struct ref_list { - struct ref_list *next; - unsigned char flag; /* ISSYMREF? ISPACKED? */ - unsigned char sha1[20]; - unsigned char peeled[20]; - char name[FLEX_ARRAY]; -}; +/* + * List of all available backends + */ +static struct ref_storage_be *refs_backends = &refs_be_files; -static const char *parse_ref_line(char *line, unsigned char *sha1) +static struct ref_storage_be *find_ref_storage_backend(const char *name) { - /* - * 42: the answer to everything. - * - * In this case, it happens to be the answer to - * 40 (length of sha1 hex representation) - * +1 (space in between hex and name) - * +1 (newline at the end of the line) - */ - int len = strlen(line) - 42; - - if (len <= 0) - return NULL; - if (get_sha1_hex(line, sha1) < 0) - return NULL; - if (!isspace(line[40])) - return NULL; - line += 41; - if (isspace(*line)) - return NULL; - if (line[len] != '\n') - return NULL; - line[len] = 0; - - return line; + struct ref_storage_be *be; + for (be = refs_backends; be; be = be->next) + if (!strcmp(be->name, name)) + return be; + return NULL; } -static struct ref_list *add_ref(const char *name, const unsigned char *sha1, - int flag, struct ref_list *list, - struct ref_list **new_entry) +int ref_storage_backend_exists(const char *name) { - int len; - struct ref_list *entry; + return find_ref_storage_backend(name) != NULL; +} - /* Allocate it and add it in.. */ - len = strlen(name) + 1; - entry = xmalloc(sizeof(struct ref_list) + len); - hashcpy(entry->sha1, sha1); - hashclr(entry->peeled); - memcpy(entry->name, name, len); - entry->flag = flag; - entry->next = list; - if (new_entry) - *new_entry = entry; - return entry; +/* + * How to handle various characters in refnames: + * 0: An acceptable character for refs + * 1: End-of-component + * 2: ., look for a preceding . to reject .. in refs + * 3: {, look for a preceding @ to reject @{ in refs + * 4: A bad character: ASCII control characters, and + * ":", "?", "[", "\", "^", "~", SP, or TAB + * 5: *, reject unless REFNAME_REFSPEC_PATTERN is set + */ +static unsigned char refname_disposition[256] = { + 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 2, 1, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 0, 4, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 0, 4, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 4, 4 +}; + +/* + * Try to read one refname component from the front of refname. + * Return the length of the component found, or -1 if the component is + * not legal. It is legal if it is something reasonable to have under + * ".git/refs/"; We do not like it if: + * + * - any path component of it begins with ".", or + * - it has double dots "..", or + * - it has ASCII control characters, or + * - it has ":", "?", "[", "\", "^", "~", SP, or TAB anywhere, or + * - it has "*" anywhere unless REFNAME_REFSPEC_PATTERN is set, or + * - it ends with a "/", or + * - it ends with ".lock", or + * - it contains a "@{" portion + */ +static int check_refname_component(const char *refname, int *flags) +{ + const char *cp; + char last = '\0'; + + for (cp = refname; ; cp++) { + int ch = *cp & 255; + unsigned char disp = refname_disposition[ch]; + switch (disp) { + case 1: + goto out; + case 2: + if (last == '.') + return -1; /* Refname contains "..". */ + break; + case 3: + if (last == '@') + return -1; /* Refname contains "@{". */ + break; + case 4: + return -1; + case 5: + if (!(*flags & REFNAME_REFSPEC_PATTERN)) + return -1; /* refspec can't be a pattern */ + + /* + * Unset the pattern flag so that we only accept + * a single asterisk for one side of refspec. + */ + *flags &= ~ REFNAME_REFSPEC_PATTERN; + break; + } + last = ch; + } +out: + if (cp == refname) + return 0; /* Component has zero length. */ + if (refname[0] == '.') + return -1; /* Component starts with '.'. */ + if (cp - refname >= LOCK_SUFFIX_LEN && + !memcmp(cp - LOCK_SUFFIX_LEN, LOCK_SUFFIX, LOCK_SUFFIX_LEN)) + return -1; /* Refname ends with ".lock". */ + return cp - refname; } -/* merge sort the ref list */ -static struct ref_list *sort_ref_list(struct ref_list *list) +int check_refname_format(const char *refname, int flags) { - int psize, qsize, last_merge_count, cmp; - struct ref_list *p, *q, *l, *e; - struct ref_list *new_list = list; - int k = 1; - int merge_count = 0; + int component_len, component_count = 0; - if (!list) - return list; + if (!strcmp(refname, "@")) + /* Refname is a single character '@'. */ + return -1; - do { - last_merge_count = merge_count; - merge_count = 0; + while (1) { + /* We are at the start of a path component. */ + component_len = check_refname_component(refname, &flags); + if (component_len <= 0) + return -1; - psize = 0; + component_count++; + if (refname[component_len] == '\0') + break; + /* Skip to next component. */ + refname += component_len + 1; + } - p = new_list; - q = new_list; - new_list = NULL; - l = NULL; + if (refname[component_len - 1] == '.') + return -1; /* Refname ends with '.'. */ + if (!(flags & REFNAME_ALLOW_ONELEVEL) && component_count < 2) + return -1; /* Refname has only one component. */ + return 0; +} - while (p) { - merge_count++; +int refname_is_safe(const char *refname) +{ + const char *rest; - while (psize < k && q->next) { - q = q->next; - psize++; - } - qsize = k; - - while ((psize > 0) || (qsize > 0 && q)) { - if (qsize == 0 || !q) { - e = p; - p = p->next; - psize--; - } else if (psize == 0) { - e = q; - q = q->next; - qsize--; - } else { - cmp = strcmp(q->name, p->name); - if (cmp < 0) { - e = q; - q = q->next; - qsize--; - } else if (cmp > 0) { - e = p; - p = p->next; - psize--; - } else { - if (hashcmp(q->sha1, p->sha1)) - die("Duplicated ref, and SHA1s don't match: %s", - q->name); - warning("Duplicated ref: %s", q->name); - e = q; - q = q->next; - qsize--; - free(e); - e = p; - p = p->next; - psize--; - } - } - - e->next = NULL; - - if (l) - l->next = e; - if (!new_list) - new_list = e; - l = e; - } + if (skip_prefix(refname, "refs/", &rest)) { + char *buf; + int result; + size_t restlen = strlen(rest); - p = q; - }; + /* rest must not be empty, or start or end with "/" */ + if (!restlen || *rest == '/' || rest[restlen - 1] == '/') + return 0; - k = k * 2; - } while ((last_merge_count != merge_count) || (last_merge_count != 1)); + /* + * Does the refname try to escape refs/? + * For example: refs/foo/../bar is safe but refs/foo/../../bar + * is not. + */ + buf = xmallocz(restlen); + result = !normalize_path_copy(buf, rest) && !strcmp(buf, rest); + free(buf); + return result; + } - return new_list; + do { + if (!isupper(*refname) && *refname != '_') + return 0; + refname++; + } while (*refname); + return 1; } /* - * Future: need to be in "struct repository" - * when doing a full libification. + * Return true if refname, which has the specified oid and flags, can + * be resolved to an object in the database. If the referred-to object + * does not exist, emit a warning and return false. */ -static struct cached_refs { - char did_loose; - char did_packed; - struct ref_list *loose; - struct ref_list *packed; -} cached_refs, submodule_refs; -static struct ref_list *current_ref; - -static struct ref_list *extra_refs; - -static void free_ref_list(struct ref_list *list) -{ - struct ref_list *next; - for ( ; list; list = next) { - next = list->next; - free(list); +int ref_resolves_to_object(const char *refname, + const struct object_id *oid, + unsigned int flags) +{ + if (flags & REF_ISBROKEN) + return 0; + if (!has_sha1_file(oid->hash)) { + error("%s does not point to a valid object!", refname); + return 0; } + return 1; } -static void invalidate_cached_refs(void) +char *refs_resolve_refdup(struct ref_store *refs, + const char *refname, int resolve_flags, + unsigned char *sha1, int *flags) { - struct cached_refs *ca = &cached_refs; + const char *result; - if (ca->did_loose && ca->loose) - free_ref_list(ca->loose); - if (ca->did_packed && ca->packed) - free_ref_list(ca->packed); - ca->loose = ca->packed = NULL; - ca->did_loose = ca->did_packed = 0; + result = refs_resolve_ref_unsafe(refs, refname, resolve_flags, + sha1, flags); + return xstrdup_or_null(result); } -static void read_packed_refs(FILE *f, struct cached_refs *cached_refs) +char *resolve_refdup(const char *refname, int resolve_flags, + unsigned char *sha1, int *flags) { - struct ref_list *list = NULL; - struct ref_list *last = NULL; - char refline[PATH_MAX]; - int flag = REF_ISPACKED; - - while (fgets(refline, sizeof(refline), f)) { - unsigned char sha1[20]; - const char *name; - static const char header[] = "# pack-refs with:"; + return refs_resolve_refdup(get_main_ref_store(), + refname, resolve_flags, + sha1, flags); +} - if (!strncmp(refline, header, sizeof(header)-1)) { - const char *traits = refline + sizeof(header) - 1; - if (strstr(traits, " peeled ")) - flag |= REF_KNOWS_PEELED; - /* perhaps other traits later as well */ - continue; - } +/* The argument to filter_refs */ +struct ref_filter { + const char *pattern; + each_ref_fn *fn; + void *cb_data; +}; - name = parse_ref_line(refline, sha1); - if (name) { - list = add_ref(name, sha1, flag, list, &last); - continue; - } - if (last && - refline[0] == '^' && - strlen(refline) == 42 && - refline[41] == '\n' && - !get_sha1_hex(refline + 1, sha1)) - hashcpy(last->peeled, sha1); - } - cached_refs->packed = sort_ref_list(list); +int refs_read_ref_full(struct ref_store *refs, const char *refname, + int resolve_flags, unsigned char *sha1, int *flags) +{ + if (refs_resolve_ref_unsafe(refs, refname, resolve_flags, sha1, flags)) + return 0; + return -1; } -void add_extra_ref(const char *name, const unsigned char *sha1, int flag) +int read_ref_full(const char *refname, int resolve_flags, unsigned char *sha1, int *flags) { - extra_refs = add_ref(name, sha1, flag, extra_refs, NULL); + return refs_read_ref_full(get_main_ref_store(), refname, + resolve_flags, sha1, flags); } -void clear_extra_refs(void) +int read_ref(const char *refname, unsigned char *sha1) { - free_ref_list(extra_refs); - extra_refs = NULL; + return read_ref_full(refname, RESOLVE_REF_READING, sha1, NULL); } -static struct ref_list *get_packed_refs(const char *submodule) +int ref_exists(const char *refname) { - const char *packed_refs_file; - struct cached_refs *refs; - - if (submodule) { - packed_refs_file = git_path_submodule(submodule, "packed-refs"); - refs = &submodule_refs; - free_ref_list(refs->packed); - } else { - packed_refs_file = git_path("packed-refs"); - refs = &cached_refs; - } - - if (!refs->did_packed || submodule) { - FILE *f = fopen(packed_refs_file, "r"); - refs->packed = NULL; - if (f) { - read_packed_refs(f, refs); - fclose(f); - } - refs->did_packed = 1; - } - return refs->packed; + return !!resolve_ref_unsafe(refname, RESOLVE_REF_READING, NULL, NULL); } -static struct ref_list *get_ref_dir(const char *submodule, const char *base, - struct ref_list *list) +static int filter_refs(const char *refname, const struct object_id *oid, + int flags, void *data) { - DIR *dir; - const char *path; - - if (submodule) - path = git_path_submodule(submodule, "%s", base); - else - path = git_path("%s", base); + struct ref_filter *filter = (struct ref_filter *)data; + if (wildmatch(filter->pattern, refname, 0)) + return 0; + return filter->fn(refname, oid, flags, filter->cb_data); +} - dir = opendir(path); +enum peel_status peel_object(const unsigned char *name, unsigned char *sha1) +{ + struct object *o = lookup_unknown_object(name); - if (dir) { - struct dirent *de; - int baselen = strlen(base); - char *ref = xmalloc(baselen + 257); + if (o->type == OBJ_NONE) { + int type = sha1_object_info(name, NULL); + if (type < 0 || !object_as_type(o, type, 0)) + return PEEL_INVALID; + } - memcpy(ref, base, baselen); - if (baselen && base[baselen-1] != '/') - ref[baselen++] = '/'; + if (o->type != OBJ_TAG) + return PEEL_NON_TAG; - while ((de = readdir(dir)) != NULL) { - unsigned char sha1[20]; - struct stat st; - int flag; - int namelen; - const char *refdir; + o = deref_tag_noverify(o); + if (!o) + return PEEL_INVALID; - if (de->d_name[0] == '.') - continue; - namelen = strlen(de->d_name); - if (namelen > 255) - continue; - if (has_extension(de->d_name, ".lock")) - continue; - memcpy(ref + baselen, de->d_name, namelen+1); - refdir = submodule - ? git_path_submodule(submodule, "%s", ref) - : git_path("%s", ref); - if (stat(refdir, &st) < 0) - continue; - if (S_ISDIR(st.st_mode)) { - list = get_ref_dir(submodule, ref, list); - continue; - } - if (submodule) { - hashclr(sha1); - flag = 0; - if (resolve_gitlink_ref(submodule, ref, sha1) < 0) { - hashclr(sha1); - flag |= REF_BROKEN; - } - } else - if (!resolve_ref(ref, sha1, 1, &flag)) { - hashclr(sha1); - flag |= REF_BROKEN; - } - list = add_ref(ref, sha1, flag, list, NULL); - } - free(ref); - closedir(dir); - } - return sort_ref_list(list); + hashcpy(sha1, o->oid.hash); + return PEEL_PEELED; } struct warn_if_dangling_data { FILE *fp; const char *refname; + const struct string_list *refnames; const char *msg_fmt; }; -static int warn_if_dangling_symref(const char *refname, const unsigned char *sha1, +static int warn_if_dangling_symref(const char *refname, const struct object_id *oid, int flags, void *cb_data) { struct warn_if_dangling_data *d = cb_data; const char *resolves_to; - unsigned char junk[20]; if (!(flags & REF_ISSYMREF)) return 0; - resolves_to = resolve_ref(refname, junk, 0, NULL); - if (!resolves_to || strcmp(resolves_to, d->refname)) + resolves_to = resolve_ref_unsafe(refname, 0, NULL, NULL); + if (!resolves_to + || (d->refname + ? strcmp(resolves_to, d->refname) + : !string_list_has_string(d->refnames, resolves_to))) { return 0; + } fprintf(d->fp, d->msg_fmt, refname); + fputc('\n', d->fp); return 0; } @@ -352,1595 +308,1775 @@ void warn_dangling_symref(FILE *fp, const char *msg_fmt, const char *refname) data.fp = fp; data.refname = refname; + data.refnames = NULL; data.msg_fmt = msg_fmt; for_each_rawref(warn_if_dangling_symref, &data); } -static struct ref_list *get_loose_refs(const char *submodule) +void warn_dangling_symrefs(FILE *fp, const char *msg_fmt, const struct string_list *refnames) { - if (submodule) { - free_ref_list(submodule_refs.loose); - submodule_refs.loose = get_ref_dir(submodule, "refs", NULL); - return submodule_refs.loose; - } + struct warn_if_dangling_data data; - if (!cached_refs.did_loose) { - cached_refs.loose = get_ref_dir(NULL, "refs", NULL); - cached_refs.did_loose = 1; - } - return cached_refs.loose; + data.fp = fp; + data.refname = NULL; + data.refnames = refnames; + data.msg_fmt = msg_fmt; + for_each_rawref(warn_if_dangling_symref, &data); } -/* We allow "recursive" symbolic refs. Only within reason, though */ -#define MAXDEPTH 5 -#define MAXREFLEN (1024) +int refs_for_each_tag_ref(struct ref_store *refs, each_ref_fn fn, void *cb_data) +{ + return refs_for_each_ref_in(refs, "refs/tags/", fn, cb_data); +} -static int resolve_gitlink_packed_ref(char *name, int pathlen, const char *refname, unsigned char *result) +int for_each_tag_ref(each_ref_fn fn, void *cb_data) { - FILE *f; - struct cached_refs refs; - struct ref_list *ref; - int retval; + return refs_for_each_tag_ref(get_main_ref_store(), fn, cb_data); +} - strcpy(name + pathlen, "packed-refs"); - f = fopen(name, "r"); - if (!f) - return -1; - read_packed_refs(f, &refs); - fclose(f); - ref = refs.packed; - retval = -1; - while (ref) { - if (!strcmp(ref->name, refname)) { - retval = 0; - memcpy(result, ref->sha1, 20); - break; - } - ref = ref->next; - } - free_ref_list(refs.packed); - return retval; +int refs_for_each_branch_ref(struct ref_store *refs, each_ref_fn fn, void *cb_data) +{ + return refs_for_each_ref_in(refs, "refs/heads/", fn, cb_data); } -static int resolve_gitlink_ref_recursive(char *name, int pathlen, const char *refname, unsigned char *result, int recursion) +int for_each_branch_ref(each_ref_fn fn, void *cb_data) { - int fd, len = strlen(refname); - char buffer[128], *p; + return refs_for_each_branch_ref(get_main_ref_store(), fn, cb_data); +} - if (recursion > MAXDEPTH || len > MAXREFLEN) - return -1; - memcpy(name + pathlen, refname, len+1); - fd = open(name, O_RDONLY); - if (fd < 0) - return resolve_gitlink_packed_ref(name, pathlen, refname, result); - - len = read(fd, buffer, sizeof(buffer)-1); - close(fd); - if (len < 0) - return -1; - while (len && isspace(buffer[len-1])) - len--; - buffer[len] = 0; +int refs_for_each_remote_ref(struct ref_store *refs, each_ref_fn fn, void *cb_data) +{ + return refs_for_each_ref_in(refs, "refs/remotes/", fn, cb_data); +} - /* Was it a detached head or an old-fashioned symlink? */ - if (!get_sha1_hex(buffer, result)) - return 0; +int for_each_remote_ref(each_ref_fn fn, void *cb_data) +{ + return refs_for_each_remote_ref(get_main_ref_store(), fn, cb_data); +} - /* Symref? */ - if (strncmp(buffer, "ref:", 4)) - return -1; - p = buffer + 4; - while (isspace(*p)) - p++; +int head_ref_namespaced(each_ref_fn fn, void *cb_data) +{ + struct strbuf buf = STRBUF_INIT; + int ret = 0; + struct object_id oid; + int flag; - return resolve_gitlink_ref_recursive(name, pathlen, p, result, recursion+1); + strbuf_addf(&buf, "%sHEAD", get_git_namespace()); + if (!read_ref_full(buf.buf, RESOLVE_REF_READING, oid.hash, &flag)) + ret = fn(buf.buf, &oid, flag, cb_data); + strbuf_release(&buf); + + return ret; } -int resolve_gitlink_ref(const char *path, const char *refname, unsigned char *result) +int for_each_glob_ref_in(each_ref_fn fn, const char *pattern, + const char *prefix, void *cb_data) { - int len = strlen(path), retval; - char *gitdir; - const char *tmp; + struct strbuf real_pattern = STRBUF_INIT; + struct ref_filter filter; + int ret; - while (len && path[len-1] == '/') - len--; - if (!len) - return -1; - gitdir = xmalloc(len + MAXREFLEN + 8); - memcpy(gitdir, path, len); - memcpy(gitdir + len, "/.git", 6); - len += 5; - - tmp = read_gitfile_gently(gitdir); - if (tmp) { - free(gitdir); - len = strlen(tmp); - gitdir = xmalloc(len + MAXREFLEN + 3); - memcpy(gitdir, tmp, len); + if (!prefix && !starts_with(pattern, "refs/")) + strbuf_addstr(&real_pattern, "refs/"); + else if (prefix) + strbuf_addstr(&real_pattern, prefix); + strbuf_addstr(&real_pattern, pattern); + + if (!has_glob_specials(pattern)) { + /* Append implied '/' '*' if not present. */ + strbuf_complete(&real_pattern, '/'); + /* No need to check for '*', there is none. */ + strbuf_addch(&real_pattern, '*'); } - gitdir[len] = '/'; - gitdir[++len] = '\0'; - retval = resolve_gitlink_ref_recursive(gitdir, len, refname, result, 0); - free(gitdir); - return retval; + + filter.pattern = real_pattern.buf; + filter.fn = fn; + filter.cb_data = cb_data; + ret = for_each_ref(filter_refs, &filter); + + strbuf_release(&real_pattern); + return ret; } -/* - * If the "reading" argument is set, this function finds out what _object_ - * the ref points at by "reading" the ref. The ref, if it is not symbolic, - * has to exist, and if it is symbolic, it has to point at an existing ref, - * because the "read" goes through the symref to the ref it points at. - * - * The access that is not "reading" may often be "writing", but does not - * have to; it can be merely checking _where it leads to_. If it is a - * prelude to "writing" to the ref, a write to a symref that points at - * yet-to-be-born ref will create the real ref pointed by the symref. - * reading=0 allows the caller to check where such a symref leads to. - */ -const char *resolve_ref(const char *ref, unsigned char *sha1, int reading, int *flag) +int for_each_glob_ref(each_ref_fn fn, const char *pattern, void *cb_data) { - int depth = MAXDEPTH; - ssize_t len; - char buffer[256]; - static char ref_buffer[256]; - - if (flag) - *flag = 0; + return for_each_glob_ref_in(fn, pattern, NULL, cb_data); +} - for (;;) { - char path[PATH_MAX]; - struct stat st; - char *buf; - int fd; +const char *prettify_refname(const char *name) +{ + if (skip_prefix(name, "refs/heads/", &name) || + skip_prefix(name, "refs/tags/", &name) || + skip_prefix(name, "refs/remotes/", &name)) + ; /* nothing */ + return name; +} - if (--depth < 0) - return NULL; +static const char *ref_rev_parse_rules[] = { + "%.*s", + "refs/%.*s", + "refs/tags/%.*s", + "refs/heads/%.*s", + "refs/remotes/%.*s", + "refs/remotes/%.*s/HEAD", + NULL +}; - git_snpath(path, sizeof(path), "%s", ref); - /* Special case: non-existing file. */ - if (lstat(path, &st) < 0) { - struct ref_list *list = get_packed_refs(NULL); - while (list) { - if (!strcmp(ref, list->name)) { - hashcpy(sha1, list->sha1); - if (flag) - *flag |= REF_ISPACKED; - return ref; - } - list = list->next; - } - if (reading || errno != ENOENT) - return NULL; - hashclr(sha1); - return ref; - } +int refname_match(const char *abbrev_name, const char *full_name) +{ + const char **p; + const int abbrev_name_len = strlen(abbrev_name); - /* Follow "normalized" - ie "refs/.." symlinks by hand */ - if (S_ISLNK(st.st_mode)) { - len = readlink(path, buffer, sizeof(buffer)-1); - if (len >= 5 && !memcmp("refs/", buffer, 5)) { - buffer[len] = 0; - strcpy(ref_buffer, buffer); - ref = ref_buffer; - if (flag) - *flag |= REF_ISSYMREF; - continue; - } + for (p = ref_rev_parse_rules; *p; p++) { + if (!strcmp(full_name, mkpath(*p, abbrev_name_len, abbrev_name))) { + return 1; } + } - /* Is it a directory? */ - if (S_ISDIR(st.st_mode)) { - errno = EISDIR; - return NULL; - } + return 0; +} - /* - * Anything else, just open it and try to use it as - * a ref - */ - fd = open(path, O_RDONLY); - if (fd < 0) - return NULL; - len = read_in_full(fd, buffer, sizeof(buffer)-1); - close(fd); +/* + * *string and *len will only be substituted, and *string returned (for + * later free()ing) if the string passed in is a magic short-hand form + * to name a branch. + */ +static char *substitute_branch_name(const char **string, int *len) +{ + struct strbuf buf = STRBUF_INIT; + int ret = interpret_branch_name(*string, *len, &buf, 0); - /* - * Is it a symbolic ref? - */ - if (len < 4 || memcmp("ref:", buffer, 4)) - break; - buf = buffer + 4; - len -= 4; - while (len && isspace(*buf)) - buf++, len--; - while (len && isspace(buf[len-1])) - len--; - buf[len] = 0; - memcpy(ref_buffer, buf, len + 1); - ref = ref_buffer; - if (flag) - *flag |= REF_ISSYMREF; + if (ret == *len) { + size_t size; + *string = strbuf_detach(&buf, &size); + *len = size; + return (char *)*string; } - if (len < 40 || get_sha1_hex(buffer, sha1)) - return NULL; - return ref; -} -/* The argument to filter_refs */ -struct ref_filter { - const char *pattern; - each_ref_fn *fn; - void *cb_data; -}; + return NULL; +} -int read_ref(const char *ref, unsigned char *sha1) +int dwim_ref(const char *str, int len, unsigned char *sha1, char **ref) { - if (resolve_ref(ref, sha1, 1, NULL)) - return 0; - return -1; + char *last_branch = substitute_branch_name(&str, &len); + int refs_found = expand_ref(str, len, sha1, ref); + free(last_branch); + return refs_found; } -#define DO_FOR_EACH_INCLUDE_BROKEN 01 -static int do_one_ref(const char *base, each_ref_fn fn, int trim, - int flags, void *cb_data, struct ref_list *entry) +int expand_ref(const char *str, int len, unsigned char *sha1, char **ref) { - if (strncmp(base, entry->name, trim)) - return 0; + const char **p, *r; + int refs_found = 0; + struct strbuf fullref = STRBUF_INIT; - if (!(flags & DO_FOR_EACH_INCLUDE_BROKEN)) { - if (entry->flag & REF_BROKEN) - return 0; /* ignore dangling symref */ - if (!has_sha1_file(entry->sha1)) { - error("%s does not point to a valid object!", entry->name); - return 0; + *ref = NULL; + for (p = ref_rev_parse_rules; *p; p++) { + unsigned char sha1_from_ref[20]; + unsigned char *this_result; + int flag; + + this_result = refs_found ? sha1_from_ref : sha1; + strbuf_reset(&fullref); + strbuf_addf(&fullref, *p, len, str); + r = resolve_ref_unsafe(fullref.buf, RESOLVE_REF_READING, + this_result, &flag); + if (r) { + if (!refs_found++) + *ref = xstrdup(r); + if (!warn_ambiguous_refs) + break; + } else if ((flag & REF_ISSYMREF) && strcmp(fullref.buf, "HEAD")) { + warning("ignoring dangling symref %s.", fullref.buf); + } else if ((flag & REF_ISBROKEN) && strchr(fullref.buf, '/')) { + warning("ignoring broken ref %s.", fullref.buf); } } - current_ref = entry; - return fn(entry->name + trim, entry->sha1, entry->flag, cb_data); + strbuf_release(&fullref); + return refs_found; } -static int filter_refs(const char *ref, const unsigned char *sha, int flags, - void *data) +int dwim_log(const char *str, int len, unsigned char *sha1, char **log) { - struct ref_filter *filter = (struct ref_filter *)data; - if (fnmatch(filter->pattern, ref, 0)) - return 0; - return filter->fn(ref, sha, flags, filter->cb_data); + char *last_branch = substitute_branch_name(&str, &len); + const char **p; + int logs_found = 0; + struct strbuf path = STRBUF_INIT; + + *log = NULL; + for (p = ref_rev_parse_rules; *p; p++) { + unsigned char hash[20]; + const char *ref, *it; + + strbuf_reset(&path); + strbuf_addf(&path, *p, len, str); + ref = resolve_ref_unsafe(path.buf, RESOLVE_REF_READING, + hash, NULL); + if (!ref) + continue; + if (reflog_exists(path.buf)) + it = path.buf; + else if (strcmp(ref, path.buf) && reflog_exists(ref)) + it = ref; + else + continue; + if (!logs_found++) { + *log = xstrdup(it); + hashcpy(sha1, hash); + } + if (!warn_ambiguous_refs) + break; + } + strbuf_release(&path); + free(last_branch); + return logs_found; } -int peel_ref(const char *ref, unsigned char *sha1) +static int is_per_worktree_ref(const char *refname) { - int flag; - unsigned char base[20]; - struct object *o; + return !strcmp(refname, "HEAD") || + starts_with(refname, "refs/bisect/"); +} - if (current_ref && (current_ref->name == ref - || !strcmp(current_ref->name, ref))) { - if (current_ref->flag & REF_KNOWS_PEELED) { - hashcpy(sha1, current_ref->peeled); +static int is_pseudoref_syntax(const char *refname) +{ + const char *c; + + for (c = refname; *c; c++) { + if (!isupper(*c) && *c != '-' && *c != '_') return 0; - } - hashcpy(base, current_ref->sha1); - goto fallback; } - if (!resolve_ref(ref, base, 1, &flag)) - return -1; + return 1; +} - if ((flag & REF_ISPACKED)) { - struct ref_list *list = get_packed_refs(NULL); +enum ref_type ref_type(const char *refname) +{ + if (is_per_worktree_ref(refname)) + return REF_TYPE_PER_WORKTREE; + if (is_pseudoref_syntax(refname)) + return REF_TYPE_PSEUDOREF; + return REF_TYPE_NORMAL; +} - while (list) { - if (!strcmp(list->name, ref)) { - if (list->flag & REF_KNOWS_PEELED) { - hashcpy(sha1, list->peeled); - return 0; - } - /* older pack-refs did not leave peeled ones */ - break; - } - list = list->next; - } - } +long get_files_ref_lock_timeout_ms(void) +{ + static int configured = 0; -fallback: - o = parse_object(base); - if (o && o->type == OBJ_TAG) { - o = deref_tag(o, ref, 0); - if (o) { - hashcpy(sha1, o->sha1); - return 0; - } + /* The default timeout is 100 ms: */ + static int timeout_ms = 100; + + if (!configured) { + git_config_get_int("core.filesreflocktimeout", &timeout_ms); + configured = 1; } - return -1; + + return timeout_ms; } -static int do_for_each_ref(const char *submodule, const char *base, each_ref_fn fn, - int trim, int flags, void *cb_data) +static int write_pseudoref(const char *pseudoref, const unsigned char *sha1, + const unsigned char *old_sha1, struct strbuf *err) { - int retval = 0; - struct ref_list *packed = get_packed_refs(submodule); - struct ref_list *loose = get_loose_refs(submodule); + const char *filename; + int fd; + static struct lock_file lock; + struct strbuf buf = STRBUF_INIT; + int ret = -1; + + strbuf_addf(&buf, "%s\n", sha1_to_hex(sha1)); - struct ref_list *extra; + filename = git_path("%s", pseudoref); + fd = hold_lock_file_for_update_timeout(&lock, filename, + LOCK_DIE_ON_ERROR, + get_files_ref_lock_timeout_ms()); + if (fd < 0) { + strbuf_addf(err, "could not open '%s' for writing: %s", + filename, strerror(errno)); + goto done; + } - for (extra = extra_refs; extra; extra = extra->next) - retval = do_one_ref(base, fn, trim, flags, cb_data, extra); + if (old_sha1) { + unsigned char actual_old_sha1[20]; - while (packed && loose) { - struct ref_list *entry; - int cmp = strcmp(packed->name, loose->name); - if (!cmp) { - packed = packed->next; - continue; - } - if (cmp > 0) { - entry = loose; - loose = loose->next; - } else { - entry = packed; - packed = packed->next; + if (read_ref(pseudoref, actual_old_sha1)) + die("could not read ref '%s'", pseudoref); + if (hashcmp(actual_old_sha1, old_sha1)) { + strbuf_addf(err, "unexpected sha1 when writing '%s'", pseudoref); + rollback_lock_file(&lock); + goto done; } - retval = do_one_ref(base, fn, trim, flags, cb_data, entry); - if (retval) - goto end_each; } - for (packed = packed ? packed : loose; packed; packed = packed->next) { - retval = do_one_ref(base, fn, trim, flags, cb_data, packed); - if (retval) - goto end_each; + if (write_in_full(fd, buf.buf, buf.len) < 0) { + strbuf_addf(err, "could not write to '%s'", filename); + rollback_lock_file(&lock); + goto done; } -end_each: - current_ref = NULL; - return retval; + commit_lock_file(&lock); + ret = 0; +done: + strbuf_release(&buf); + return ret; } - -static int do_head_ref(const char *submodule, each_ref_fn fn, void *cb_data) +static int delete_pseudoref(const char *pseudoref, const unsigned char *old_sha1) { - unsigned char sha1[20]; - int flag; + static struct lock_file lock; + const char *filename; - if (submodule) { - if (resolve_gitlink_ref(submodule, "HEAD", sha1) == 0) - return fn("HEAD", sha1, 0, cb_data); + filename = git_path("%s", pseudoref); - return 0; - } + if (old_sha1 && !is_null_sha1(old_sha1)) { + int fd; + unsigned char actual_old_sha1[20]; + + fd = hold_lock_file_for_update_timeout( + &lock, filename, LOCK_DIE_ON_ERROR, + get_files_ref_lock_timeout_ms()); + if (fd < 0) + die_errno(_("Could not open '%s' for writing"), filename); + if (read_ref(pseudoref, actual_old_sha1)) + die("could not read ref '%s'", pseudoref); + if (hashcmp(actual_old_sha1, old_sha1)) { + warning("Unexpected sha1 when deleting %s", pseudoref); + rollback_lock_file(&lock); + return -1; + } - if (resolve_ref("HEAD", sha1, 1, &flag)) - return fn("HEAD", sha1, flag, cb_data); + unlink(filename); + rollback_lock_file(&lock); + } else { + unlink(filename); + } return 0; } -int head_ref(each_ref_fn fn, void *cb_data) +int refs_delete_ref(struct ref_store *refs, const char *msg, + const char *refname, + const unsigned char *old_sha1, + unsigned int flags) { - return do_head_ref(NULL, fn, cb_data); -} + struct ref_transaction *transaction; + struct strbuf err = STRBUF_INIT; -int head_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data) -{ - return do_head_ref(submodule, fn, cb_data); + if (ref_type(refname) == REF_TYPE_PSEUDOREF) { + assert(refs == get_main_ref_store()); + return delete_pseudoref(refname, old_sha1); + } + + transaction = ref_store_transaction_begin(refs, &err); + if (!transaction || + ref_transaction_delete(transaction, refname, old_sha1, + flags, msg, &err) || + ref_transaction_commit(transaction, &err)) { + error("%s", err.buf); + ref_transaction_free(transaction); + strbuf_release(&err); + return 1; + } + ref_transaction_free(transaction); + strbuf_release(&err); + return 0; } -int for_each_ref(each_ref_fn fn, void *cb_data) +int delete_ref(const char *msg, const char *refname, + const unsigned char *old_sha1, unsigned int flags) { - return do_for_each_ref(NULL, "refs/", fn, 0, 0, cb_data); + return refs_delete_ref(get_main_ref_store(), msg, refname, + old_sha1, flags); } -int for_each_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data) +int copy_reflog_msg(char *buf, const char *msg) { - return do_for_each_ref(submodule, "refs/", fn, 0, 0, cb_data); + char *cp = buf; + char c; + int wasspace = 1; + + *cp++ = '\t'; + while ((c = *msg++)) { + if (wasspace && isspace(c)) + continue; + wasspace = isspace(c); + if (wasspace) + c = ' '; + *cp++ = c; + } + while (buf < cp && isspace(cp[-1])) + cp--; + *cp++ = '\n'; + return cp - buf; } -int for_each_ref_in(const char *prefix, each_ref_fn fn, void *cb_data) +int should_autocreate_reflog(const char *refname) { - return do_for_each_ref(NULL, prefix, fn, strlen(prefix), 0, cb_data); + switch (log_all_ref_updates) { + case LOG_REFS_ALWAYS: + return 1; + case LOG_REFS_NORMAL: + return starts_with(refname, "refs/heads/") || + starts_with(refname, "refs/remotes/") || + starts_with(refname, "refs/notes/") || + !strcmp(refname, "HEAD"); + default: + return 0; + } } -int for_each_ref_in_submodule(const char *submodule, const char *prefix, - each_ref_fn fn, void *cb_data) +int is_branch(const char *refname) { - return do_for_each_ref(submodule, prefix, fn, strlen(prefix), 0, cb_data); + return !strcmp(refname, "HEAD") || starts_with(refname, "refs/heads/"); } -int for_each_tag_ref(each_ref_fn fn, void *cb_data) -{ - return for_each_ref_in("refs/tags/", fn, cb_data); +struct read_ref_at_cb { + const char *refname; + timestamp_t at_time; + int cnt; + int reccnt; + unsigned char *sha1; + int found_it; + + unsigned char osha1[20]; + unsigned char nsha1[20]; + int tz; + timestamp_t date; + char **msg; + timestamp_t *cutoff_time; + int *cutoff_tz; + int *cutoff_cnt; +}; + +static int read_ref_at_ent(struct object_id *ooid, struct object_id *noid, + const char *email, timestamp_t timestamp, int tz, + const char *message, void *cb_data) +{ + struct read_ref_at_cb *cb = cb_data; + + cb->reccnt++; + cb->tz = tz; + cb->date = timestamp; + + if (timestamp <= cb->at_time || cb->cnt == 0) { + if (cb->msg) + *cb->msg = xstrdup(message); + if (cb->cutoff_time) + *cb->cutoff_time = timestamp; + if (cb->cutoff_tz) + *cb->cutoff_tz = tz; + if (cb->cutoff_cnt) + *cb->cutoff_cnt = cb->reccnt - 1; + /* + * we have not yet updated cb->[n|o]sha1 so they still + * hold the values for the previous record. + */ + if (!is_null_sha1(cb->osha1)) { + hashcpy(cb->sha1, noid->hash); + if (hashcmp(cb->osha1, noid->hash)) + warning("Log for ref %s has gap after %s.", + cb->refname, show_date(cb->date, cb->tz, DATE_MODE(RFC2822))); + } + else if (cb->date == cb->at_time) + hashcpy(cb->sha1, noid->hash); + else if (hashcmp(noid->hash, cb->sha1)) + warning("Log for ref %s unexpectedly ended on %s.", + cb->refname, show_date(cb->date, cb->tz, + DATE_MODE(RFC2822))); + hashcpy(cb->osha1, ooid->hash); + hashcpy(cb->nsha1, noid->hash); + cb->found_it = 1; + return 1; + } + hashcpy(cb->osha1, ooid->hash); + hashcpy(cb->nsha1, noid->hash); + if (cb->cnt > 0) + cb->cnt--; + return 0; } -int for_each_tag_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data) -{ - return for_each_ref_in_submodule(submodule, "refs/tags/", fn, cb_data); +static int read_ref_at_ent_oldest(struct object_id *ooid, struct object_id *noid, + const char *email, timestamp_t timestamp, + int tz, const char *message, void *cb_data) +{ + struct read_ref_at_cb *cb = cb_data; + + if (cb->msg) + *cb->msg = xstrdup(message); + if (cb->cutoff_time) + *cb->cutoff_time = timestamp; + if (cb->cutoff_tz) + *cb->cutoff_tz = tz; + if (cb->cutoff_cnt) + *cb->cutoff_cnt = cb->reccnt; + hashcpy(cb->sha1, ooid->hash); + if (is_null_sha1(cb->sha1)) + hashcpy(cb->sha1, noid->hash); + /* We just want the first entry */ + return 1; } -int for_each_branch_ref(each_ref_fn fn, void *cb_data) +int read_ref_at(const char *refname, unsigned int flags, timestamp_t at_time, int cnt, + unsigned char *sha1, char **msg, + timestamp_t *cutoff_time, int *cutoff_tz, int *cutoff_cnt) { - return for_each_ref_in("refs/heads/", fn, cb_data); + struct read_ref_at_cb cb; + + memset(&cb, 0, sizeof(cb)); + cb.refname = refname; + cb.at_time = at_time; + cb.cnt = cnt; + cb.msg = msg; + cb.cutoff_time = cutoff_time; + cb.cutoff_tz = cutoff_tz; + cb.cutoff_cnt = cutoff_cnt; + cb.sha1 = sha1; + + for_each_reflog_ent_reverse(refname, read_ref_at_ent, &cb); + + if (!cb.reccnt) { + if (flags & GET_OID_QUIETLY) + exit(128); + else + die("Log for %s is empty.", refname); + } + if (cb.found_it) + return 0; + + for_each_reflog_ent(refname, read_ref_at_ent_oldest, &cb); + + return 1; } -int for_each_branch_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data) +struct ref_transaction *ref_store_transaction_begin(struct ref_store *refs, + struct strbuf *err) { - return for_each_ref_in_submodule(submodule, "refs/heads/", fn, cb_data); + struct ref_transaction *tr; + assert(err); + + tr = xcalloc(1, sizeof(struct ref_transaction)); + tr->ref_store = refs; + return tr; } -int for_each_remote_ref(each_ref_fn fn, void *cb_data) +struct ref_transaction *ref_transaction_begin(struct strbuf *err) { - return for_each_ref_in("refs/remotes/", fn, cb_data); + return ref_store_transaction_begin(get_main_ref_store(), err); } -int for_each_remote_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data) +void ref_transaction_free(struct ref_transaction *transaction) { - return for_each_ref_in_submodule(submodule, "refs/remotes/", fn, cb_data); + size_t i; + + if (!transaction) + return; + + switch (transaction->state) { + case REF_TRANSACTION_OPEN: + case REF_TRANSACTION_CLOSED: + /* OK */ + break; + case REF_TRANSACTION_PREPARED: + die("BUG: free called on a prepared reference transaction"); + break; + default: + die("BUG: unexpected reference transaction state"); + break; + } + + for (i = 0; i < transaction->nr; i++) { + free(transaction->updates[i]->msg); + free(transaction->updates[i]); + } + free(transaction->updates); + free(transaction); } -int for_each_replace_ref(each_ref_fn fn, void *cb_data) +struct ref_update *ref_transaction_add_update( + struct ref_transaction *transaction, + const char *refname, unsigned int flags, + const unsigned char *new_sha1, + const unsigned char *old_sha1, + const char *msg) { - return do_for_each_ref(NULL, "refs/replace/", fn, 13, 0, cb_data); + struct ref_update *update; + + if (transaction->state != REF_TRANSACTION_OPEN) + die("BUG: update called for transaction that is not open"); + + if ((flags & REF_ISPRUNING) && !(flags & REF_NODEREF)) + die("BUG: REF_ISPRUNING set without REF_NODEREF"); + + FLEX_ALLOC_STR(update, refname, refname); + ALLOC_GROW(transaction->updates, transaction->nr + 1, transaction->alloc); + transaction->updates[transaction->nr++] = update; + + update->flags = flags; + + if (flags & REF_HAVE_NEW) + hashcpy(update->new_oid.hash, new_sha1); + if (flags & REF_HAVE_OLD) + hashcpy(update->old_oid.hash, old_sha1); + update->msg = xstrdup_or_null(msg); + return update; } -int for_each_glob_ref_in(each_ref_fn fn, const char *pattern, - const char *prefix, void *cb_data) +int ref_transaction_update(struct ref_transaction *transaction, + const char *refname, + const unsigned char *new_sha1, + const unsigned char *old_sha1, + unsigned int flags, const char *msg, + struct strbuf *err) { - struct strbuf real_pattern = STRBUF_INIT; - struct ref_filter filter; - int ret; + assert(err); - if (!prefix && prefixcmp(pattern, "refs/")) - strbuf_addstr(&real_pattern, "refs/"); - else if (prefix) - strbuf_addstr(&real_pattern, prefix); - strbuf_addstr(&real_pattern, pattern); - - if (!has_glob_specials(pattern)) { - /* Append implied '/' '*' if not present. */ - if (real_pattern.buf[real_pattern.len - 1] != '/') - strbuf_addch(&real_pattern, '/'); - /* No need to check for '*', there is none. */ - strbuf_addch(&real_pattern, '*'); + if ((new_sha1 && !is_null_sha1(new_sha1)) ? + check_refname_format(refname, REFNAME_ALLOW_ONELEVEL) : + !refname_is_safe(refname)) { + strbuf_addf(err, "refusing to update ref with bad name '%s'", + refname); + return -1; } - filter.pattern = real_pattern.buf; - filter.fn = fn; - filter.cb_data = cb_data; - ret = for_each_ref(filter_refs, &filter); + flags &= REF_TRANSACTION_UPDATE_ALLOWED_FLAGS; - strbuf_release(&real_pattern); - return ret; + flags |= (new_sha1 ? REF_HAVE_NEW : 0) | (old_sha1 ? REF_HAVE_OLD : 0); + + ref_transaction_add_update(transaction, refname, flags, + new_sha1, old_sha1, msg); + return 0; } -int for_each_glob_ref(each_ref_fn fn, const char *pattern, void *cb_data) +int ref_transaction_create(struct ref_transaction *transaction, + const char *refname, + const unsigned char *new_sha1, + unsigned int flags, const char *msg, + struct strbuf *err) { - return for_each_glob_ref_in(fn, pattern, NULL, cb_data); + if (!new_sha1 || is_null_sha1(new_sha1)) + die("BUG: create called without valid new_sha1"); + return ref_transaction_update(transaction, refname, new_sha1, + null_sha1, flags, msg, err); } -int for_each_rawref(each_ref_fn fn, void *cb_data) +int ref_transaction_delete(struct ref_transaction *transaction, + const char *refname, + const unsigned char *old_sha1, + unsigned int flags, const char *msg, + struct strbuf *err) { - return do_for_each_ref(NULL, "refs/", fn, 0, - DO_FOR_EACH_INCLUDE_BROKEN, cb_data); + if (old_sha1 && is_null_sha1(old_sha1)) + die("BUG: delete called with old_sha1 set to zeros"); + return ref_transaction_update(transaction, refname, + null_sha1, old_sha1, + flags, msg, err); } -/* - * Make sure "ref" is something reasonable to have under ".git/refs/"; - * We do not like it if: - * - * - any path component of it begins with ".", or - * - it has double dots "..", or - * - it has ASCII control character, "~", "^", ":" or SP, anywhere, or - * - it ends with a "/". - * - it ends with ".lock" - * - it contains a "\" (backslash) - */ +int ref_transaction_verify(struct ref_transaction *transaction, + const char *refname, + const unsigned char *old_sha1, + unsigned int flags, + struct strbuf *err) +{ + if (!old_sha1) + die("BUG: verify called with old_sha1 set to NULL"); + return ref_transaction_update(transaction, refname, + NULL, old_sha1, + flags, NULL, err); +} -static inline int bad_ref_char(int ch) +int update_ref_oid(const char *msg, const char *refname, + const struct object_id *new_oid, const struct object_id *old_oid, + unsigned int flags, enum action_on_err onerr) { - if (((unsigned) ch) <= ' ' || - ch == '~' || ch == '^' || ch == ':' || ch == '\\') - return 1; - /* 2.13 Pattern Matching Notation */ - if (ch == '?' || ch == '[') /* Unsupported */ + return update_ref(msg, refname, new_oid ? new_oid->hash : NULL, + old_oid ? old_oid->hash : NULL, flags, onerr); +} + +int refs_update_ref(struct ref_store *refs, const char *msg, + const char *refname, const unsigned char *new_sha1, + const unsigned char *old_sha1, unsigned int flags, + enum action_on_err onerr) +{ + struct ref_transaction *t = NULL; + struct strbuf err = STRBUF_INIT; + int ret = 0; + + if (ref_type(refname) == REF_TYPE_PSEUDOREF) { + assert(refs == get_main_ref_store()); + ret = write_pseudoref(refname, new_sha1, old_sha1, &err); + } else { + t = ref_store_transaction_begin(refs, &err); + if (!t || + ref_transaction_update(t, refname, new_sha1, old_sha1, + flags, msg, &err) || + ref_transaction_commit(t, &err)) { + ret = 1; + ref_transaction_free(t); + } + } + if (ret) { + const char *str = "update_ref failed for ref '%s': %s"; + + switch (onerr) { + case UPDATE_REFS_MSG_ON_ERR: + error(str, refname, err.buf); + break; + case UPDATE_REFS_DIE_ON_ERR: + die(str, refname, err.buf); + break; + case UPDATE_REFS_QUIET_ON_ERR: + break; + } + strbuf_release(&err); return 1; - if (ch == '*') /* Supported at the end */ - return 2; + } + strbuf_release(&err); + if (t) + ref_transaction_free(t); return 0; } -int check_ref_format(const char *ref) +int update_ref(const char *msg, const char *refname, + const unsigned char *new_sha1, + const unsigned char *old_sha1, + unsigned int flags, enum action_on_err onerr) +{ + return refs_update_ref(get_main_ref_store(), msg, refname, new_sha1, + old_sha1, flags, onerr); +} + +char *shorten_unambiguous_ref(const char *refname, int strict) { - int ch, level, bad_type, last; - int ret = CHECK_REF_FORMAT_OK; - const char *cp = ref; + int i; + static char **scanf_fmts; + static int nr_rules; + char *short_name; + struct strbuf resolved_buf = STRBUF_INIT; - level = 0; - while (1) { - while ((ch = *cp++) == '/') - ; /* tolerate duplicated slashes */ - if (!ch) - /* should not end with slashes */ - return CHECK_REF_FORMAT_ERROR; - - /* we are at the beginning of the path component */ - if (ch == '.') - return CHECK_REF_FORMAT_ERROR; - bad_type = bad_ref_char(ch); - if (bad_type) { - if (bad_type == 2 && (!*cp || *cp == '/') && - ret == CHECK_REF_FORMAT_OK) - ret = CHECK_REF_FORMAT_WILDCARD; - else - return CHECK_REF_FORMAT_ERROR; + if (!nr_rules) { + /* + * Pre-generate scanf formats from ref_rev_parse_rules[]. + * Generate a format suitable for scanf from a + * ref_rev_parse_rules rule by interpolating "%s" at the + * location of the "%.*s". + */ + size_t total_len = 0; + size_t offset = 0; + + /* the rule list is NULL terminated, count them first */ + for (nr_rules = 0; ref_rev_parse_rules[nr_rules]; nr_rules++) + /* -2 for strlen("%.*s") - strlen("%s"); +1 for NUL */ + total_len += strlen(ref_rev_parse_rules[nr_rules]) - 2 + 1; + + scanf_fmts = xmalloc(st_add(st_mult(sizeof(char *), nr_rules), total_len)); + + offset = 0; + for (i = 0; i < nr_rules; i++) { + assert(offset < total_len); + scanf_fmts[i] = (char *)&scanf_fmts[nr_rules] + offset; + offset += snprintf(scanf_fmts[i], total_len - offset, + ref_rev_parse_rules[i], 2, "%s") + 1; } + } - last = ch; - /* scan the rest of the path component */ - while ((ch = *cp++) != 0) { - bad_type = bad_ref_char(ch); - if (bad_type) - return CHECK_REF_FORMAT_ERROR; - if (ch == '/') + /* bail out if there are no rules */ + if (!nr_rules) + return xstrdup(refname); + + /* buffer for scanf result, at most refname must fit */ + short_name = xstrdup(refname); + + /* skip first rule, it will always match */ + for (i = nr_rules - 1; i > 0 ; --i) { + int j; + int rules_to_fail = i; + int short_name_len; + + if (1 != sscanf(refname, scanf_fmts[i], short_name)) + continue; + + short_name_len = strlen(short_name); + + /* + * in strict mode, all (except the matched one) rules + * must fail to resolve to a valid non-ambiguous ref + */ + if (strict) + rules_to_fail = nr_rules; + + /* + * check if the short name resolves to a valid ref, + * but use only rules prior to the matched one + */ + for (j = 0; j < rules_to_fail; j++) { + const char *rule = ref_rev_parse_rules[j]; + + /* skip matched rule */ + if (i == j) + continue; + + /* + * the short name is ambiguous, if it resolves + * (with this previous rule) to a valid ref + * read_ref() returns 0 on success + */ + strbuf_reset(&resolved_buf); + strbuf_addf(&resolved_buf, rule, + short_name_len, short_name); + if (ref_exists(resolved_buf.buf)) break; - if (last == '.' && ch == '.') - return CHECK_REF_FORMAT_ERROR; - if (last == '@' && ch == '{') - return CHECK_REF_FORMAT_ERROR; - last = ch; } - level++; - if (!ch) { - if (ref <= cp - 2 && cp[-2] == '.') - return CHECK_REF_FORMAT_ERROR; - if (level < 2) - return CHECK_REF_FORMAT_ONELEVEL; - if (has_extension(ref, ".lock")) - return CHECK_REF_FORMAT_ERROR; - return ret; + + /* + * short name is non-ambiguous if all previous rules + * haven't resolved to a valid ref + */ + if (j == rules_to_fail) { + strbuf_release(&resolved_buf); + return short_name; } } -} -const char *prettify_refname(const char *name) -{ - return name + ( - !prefixcmp(name, "refs/heads/") ? 11 : - !prefixcmp(name, "refs/tags/") ? 10 : - !prefixcmp(name, "refs/remotes/") ? 13 : - 0); + strbuf_release(&resolved_buf); + free(short_name); + return xstrdup(refname); } -const char *ref_rev_parse_rules[] = { - "%.*s", - "refs/%.*s", - "refs/tags/%.*s", - "refs/heads/%.*s", - "refs/remotes/%.*s", - "refs/remotes/%.*s/HEAD", - NULL -}; - -const char *ref_fetch_rules[] = { - "%.*s", - "refs/%.*s", - "refs/heads/%.*s", - NULL -}; +static struct string_list *hide_refs; -int refname_match(const char *abbrev_name, const char *full_name, const char **rules) +int parse_hide_refs_config(const char *var, const char *value, const char *section) { - const char **p; - const int abbrev_name_len = strlen(abbrev_name); + const char *key; + if (!strcmp("transfer.hiderefs", var) || + (!parse_config_key(var, section, NULL, NULL, &key) && + !strcmp(key, "hiderefs"))) { + char *ref; + int len; - for (p = rules; *p; p++) { - if (!strcmp(full_name, mkpath(*p, abbrev_name_len, abbrev_name))) { - return 1; + if (!value) + return config_error_nonbool(var); + ref = xstrdup(value); + len = strlen(ref); + while (len && ref[len - 1] == '/') + ref[--len] = '\0'; + if (!hide_refs) { + hide_refs = xcalloc(1, sizeof(*hide_refs)); + hide_refs->strdup_strings = 1; } + string_list_append(hide_refs, ref); } - return 0; } -static struct ref_lock *verify_lock(struct ref_lock *lock, - const unsigned char *old_sha1, int mustexist) +int ref_is_hidden(const char *refname, const char *refname_full) { - if (!resolve_ref(lock->ref_name, lock->old_sha1, mustexist, NULL)) { - error("Can't verify ref %s", lock->ref_name); - unlock_ref(lock); - return NULL; + int i; + + if (!hide_refs) + return 0; + for (i = hide_refs->nr - 1; i >= 0; i--) { + const char *match = hide_refs->items[i].string; + const char *subject; + int neg = 0; + const char *p; + + if (*match == '!') { + neg = 1; + match++; + } + + if (*match == '^') { + subject = refname_full; + match++; + } else { + subject = refname; + } + + /* refname can be NULL when namespaces are used. */ + if (subject && + skip_prefix(subject, match, &p) && + (!*p || *p == '/')) + return !neg; } - if (hashcmp(lock->old_sha1, old_sha1)) { - error("Ref %s is at %s but expected %s", lock->ref_name, - sha1_to_hex(lock->old_sha1), sha1_to_hex(old_sha1)); - unlock_ref(lock); + return 0; +} + +const char *find_descendant_ref(const char *dirname, + const struct string_list *extras, + const struct string_list *skip) +{ + int pos; + + if (!extras) return NULL; + + /* + * Look at the place where dirname would be inserted into + * extras. If there is an entry at that position that starts + * with dirname (remember, dirname includes the trailing + * slash) and is not in skip, then we have a conflict. + */ + for (pos = string_list_find_insert_index(extras, dirname, 0); + pos < extras->nr; pos++) { + const char *extra_refname = extras->items[pos].string; + + if (!starts_with(extra_refname, dirname)) + break; + + if (!skip || !string_list_has_string(skip, extra_refname)) + return extra_refname; } - return lock; + return NULL; } -static int remove_empty_directories(const char *file) +int refs_rename_ref_available(struct ref_store *refs, + const char *old_refname, + const char *new_refname) { - /* we want to create a file but there is a directory there; - * if that is an empty directory (or a directory that contains - * only empty directories), remove them. - */ - struct strbuf path; - int result; + struct string_list skip = STRING_LIST_INIT_NODUP; + struct strbuf err = STRBUF_INIT; + int ok; - strbuf_init(&path, 20); - strbuf_addstr(&path, file); + string_list_insert(&skip, old_refname); + ok = !refs_verify_refname_available(refs, new_refname, + NULL, &skip, &err); + if (!ok) + error("%s", err.buf); - result = remove_dir_recursively(&path, REMOVE_DIR_EMPTY_ONLY); + string_list_clear(&skip, 0); + strbuf_release(&err); + return ok; +} - strbuf_release(&path); +int refs_head_ref(struct ref_store *refs, each_ref_fn fn, void *cb_data) +{ + struct object_id oid; + int flag; - return result; -} - -static int is_refname_available(const char *ref, const char *oldref, - struct ref_list *list, int quiet) -{ - int namlen = strlen(ref); /* e.g. 'foo/bar' */ - while (list) { - /* list->name could be 'foo' or 'foo/bar/baz' */ - if (!oldref || strcmp(oldref, list->name)) { - int len = strlen(list->name); - int cmplen = (namlen < len) ? namlen : len; - const char *lead = (namlen < len) ? list->name : ref; - if (!strncmp(ref, list->name, cmplen) && - lead[cmplen] == '/') { - if (!quiet) - error("'%s' exists; cannot create '%s'", - list->name, ref); - return 0; - } - } - list = list->next; - } - return 1; + if (!refs_read_ref_full(refs, "HEAD", RESOLVE_REF_READING, + oid.hash, &flag)) + return fn("HEAD", &oid, flag, cb_data); + + return 0; } -static struct ref_lock *lock_ref_sha1_basic(const char *ref, const unsigned char *old_sha1, int flags, int *type_p) +int head_ref(each_ref_fn fn, void *cb_data) { - char *ref_file; - const char *orig_ref = ref; - struct ref_lock *lock; - int last_errno = 0; - int type, lflags; - int mustexist = (old_sha1 && !is_null_sha1(old_sha1)); - int missing = 0; + return refs_head_ref(get_main_ref_store(), fn, cb_data); +} - lock = xcalloc(1, sizeof(struct ref_lock)); - lock->lock_fd = -1; +struct ref_iterator *refs_ref_iterator_begin( + struct ref_store *refs, + const char *prefix, int trim, int flags) +{ + struct ref_iterator *iter; - ref = resolve_ref(ref, lock->old_sha1, mustexist, &type); - if (!ref && errno == EISDIR) { - /* we are trying to lock foo but we used to - * have foo/bar which now does not exist; - * it is normal for the empty directory 'foo' - * to remain. - */ - ref_file = git_path("%s", orig_ref); - if (remove_empty_directories(ref_file)) { - last_errno = errno; - error("there are still refs under '%s'", orig_ref); - goto error_return; - } - ref = resolve_ref(orig_ref, lock->old_sha1, mustexist, &type); - } - if (type_p) - *type_p = type; - if (!ref) { - last_errno = errno; - error("unable to resolve reference %s: %s", - orig_ref, strerror(errno)); - goto error_return; - } - missing = is_null_sha1(lock->old_sha1); - /* When the ref did not exist and we are creating it, - * make sure there is no existing ref that is packed - * whose name begins with our refname, nor a ref whose - * name is a proper prefix of our refname. - */ - if (missing && - !is_refname_available(ref, NULL, get_packed_refs(NULL), 0)) { - last_errno = ENOTDIR; - goto error_return; - } + if (ref_paranoia < 0) + ref_paranoia = git_env_bool("GIT_REF_PARANOIA", 0); + if (ref_paranoia) + flags |= DO_FOR_EACH_INCLUDE_BROKEN; - lock->lk = xcalloc(1, sizeof(struct lock_file)); + iter = refs->be->iterator_begin(refs, prefix, flags); - lflags = LOCK_DIE_ON_ERROR; - if (flags & REF_NODEREF) { - ref = orig_ref; - lflags |= LOCK_NODEREF; - } - lock->ref_name = xstrdup(ref); - lock->orig_ref_name = xstrdup(orig_ref); - ref_file = git_path("%s", ref); - if (missing) - lock->force_write = 1; - if ((flags & REF_NODEREF) && (type & REF_ISSYMREF)) - lock->force_write = 1; - - if (safe_create_leading_directories(ref_file)) { - last_errno = errno; - error("unable to create directory for %s", ref_file); - goto error_return; - } + /* + * `iterator_begin()` already takes care of prefix, but we + * might need to do some trimming: + */ + if (trim) + iter = prefix_ref_iterator_begin(iter, "", trim); - lock->lock_fd = hold_lock_file_for_update(lock->lk, ref_file, lflags); - return old_sha1 ? verify_lock(lock, old_sha1, mustexist) : lock; + /* Sanity check for subclasses: */ + if (!iter->ordered) + BUG("reference iterator is not ordered"); - error_return: - unlock_ref(lock); - errno = last_errno; - return NULL; + return iter; } -struct ref_lock *lock_ref_sha1(const char *ref, const unsigned char *old_sha1) +/* + * Call fn for each reference in the specified submodule for which the + * refname begins with prefix. If trim is non-zero, then trim that + * many characters off the beginning of each refname before passing + * the refname to fn. flags can be DO_FOR_EACH_INCLUDE_BROKEN to + * include broken references in the iteration. If fn ever returns a + * non-zero value, stop the iteration and return that value; + * otherwise, return 0. + */ +static int do_for_each_ref(struct ref_store *refs, const char *prefix, + each_ref_fn fn, int trim, int flags, void *cb_data) { - char refpath[PATH_MAX]; - if (check_ref_format(ref)) - return NULL; - strcpy(refpath, mkpath("refs/%s", ref)); - return lock_ref_sha1_basic(refpath, old_sha1, 0, NULL); + struct ref_iterator *iter; + + if (!refs) + return 0; + + iter = refs_ref_iterator_begin(refs, prefix, trim, flags); + + return do_for_each_ref_iterator(iter, fn, cb_data); } -struct ref_lock *lock_any_ref_for_update(const char *ref, const unsigned char *old_sha1, int flags) +int refs_for_each_ref(struct ref_store *refs, each_ref_fn fn, void *cb_data) { - switch (check_ref_format(ref)) { - default: - return NULL; - case 0: - case CHECK_REF_FORMAT_ONELEVEL: - return lock_ref_sha1_basic(ref, old_sha1, flags, NULL); - } + return do_for_each_ref(refs, "", fn, 0, 0, cb_data); } -static struct lock_file packlock; +int for_each_ref(each_ref_fn fn, void *cb_data) +{ + return refs_for_each_ref(get_main_ref_store(), fn, cb_data); +} -static int repack_without_ref(const char *refname) +int refs_for_each_ref_in(struct ref_store *refs, const char *prefix, + each_ref_fn fn, void *cb_data) { - struct ref_list *list, *packed_ref_list; - int fd; - int found = 0; + return do_for_each_ref(refs, prefix, fn, strlen(prefix), 0, cb_data); +} - packed_ref_list = get_packed_refs(NULL); - for (list = packed_ref_list; list; list = list->next) { - if (!strcmp(refname, list->name)) { - found = 1; - break; - } - } - if (!found) - return 0; - fd = hold_lock_file_for_update(&packlock, git_path("packed-refs"), 0); - if (fd < 0) { - unable_to_lock_error(git_path("packed-refs"), errno); - return error("cannot delete '%s' from packed refs", refname); - } +int for_each_ref_in(const char *prefix, each_ref_fn fn, void *cb_data) +{ + return refs_for_each_ref_in(get_main_ref_store(), prefix, fn, cb_data); +} - for (list = packed_ref_list; list; list = list->next) { - char line[PATH_MAX + 100]; - int len; +int for_each_fullref_in(const char *prefix, each_ref_fn fn, void *cb_data, unsigned int broken) +{ + unsigned int flag = 0; - if (!strcmp(refname, list->name)) - continue; - len = snprintf(line, sizeof(line), "%s %s\n", - sha1_to_hex(list->sha1), list->name); - /* this should not happen but just being defensive */ - if (len > sizeof(line)) - die("too long a refname '%s'", list->name); - write_or_die(fd, line, len); - } - return commit_lock_file(&packlock); + if (broken) + flag = DO_FOR_EACH_INCLUDE_BROKEN; + return do_for_each_ref(get_main_ref_store(), + prefix, fn, 0, flag, cb_data); } -int delete_ref(const char *refname, const unsigned char *sha1, int delopt) +int refs_for_each_fullref_in(struct ref_store *refs, const char *prefix, + each_ref_fn fn, void *cb_data, + unsigned int broken) { - struct ref_lock *lock; - int err, i = 0, ret = 0, flag = 0; + unsigned int flag = 0; - lock = lock_ref_sha1_basic(refname, sha1, 0, &flag); - if (!lock) - return 1; - if (!(flag & REF_ISPACKED) || flag & REF_ISSYMREF) { - /* loose */ - const char *path; - - if (!(delopt & REF_NODEREF)) { - i = strlen(lock->lk->filename) - 5; /* .lock */ - lock->lk->filename[i] = 0; - path = lock->lk->filename; - } else { - path = git_path("%s", refname); - } - err = unlink_or_warn(path); - if (err && errno != ENOENT) - ret = 1; + if (broken) + flag = DO_FOR_EACH_INCLUDE_BROKEN; + return do_for_each_ref(refs, prefix, fn, 0, flag, cb_data); +} - if (!(delopt & REF_NODEREF)) - lock->lk->filename[i] = '.'; - } - /* removing the loose one could have resurrected an earlier - * packed one. Also, if it was not loose we need to repack - * without it. - */ - ret |= repack_without_ref(refname); +int for_each_replace_ref(each_ref_fn fn, void *cb_data) +{ + return do_for_each_ref(get_main_ref_store(), + git_replace_ref_base, fn, + strlen(git_replace_ref_base), + DO_FOR_EACH_INCLUDE_BROKEN, cb_data); +} - unlink_or_warn(git_path("logs/%s", lock->ref_name)); - invalidate_cached_refs(); - unlock_ref(lock); +int for_each_namespaced_ref(each_ref_fn fn, void *cb_data) +{ + struct strbuf buf = STRBUF_INIT; + int ret; + strbuf_addf(&buf, "%srefs/", get_git_namespace()); + ret = do_for_each_ref(get_main_ref_store(), + buf.buf, fn, 0, 0, cb_data); + strbuf_release(&buf); return ret; } -/* - * People using contrib's git-new-workdir have .git/logs/refs -> - * /some/other/path/.git/logs/refs, and that may live on another device. - * - * IOW, to avoid cross device rename errors, the temporary renamed log must - * live into logs/refs. - */ -#define TMP_RENAMED_LOG "logs/refs/.tmp-renamed-log" +int refs_for_each_rawref(struct ref_store *refs, each_ref_fn fn, void *cb_data) +{ + return do_for_each_ref(refs, "", fn, 0, + DO_FOR_EACH_INCLUDE_BROKEN, cb_data); +} -int rename_ref(const char *oldref, const char *newref, const char *logmsg) +int for_each_rawref(each_ref_fn fn, void *cb_data) { - static const char renamed_ref[] = "RENAMED-REF"; - unsigned char sha1[20], orig_sha1[20]; - int flag = 0, logmoved = 0; - struct ref_lock *lock; - struct stat loginfo; - int log = !lstat(git_path("logs/%s", oldref), &loginfo); - const char *symref = NULL; - - if (log && S_ISLNK(loginfo.st_mode)) - return error("reflog for %s is a symlink", oldref); - - symref = resolve_ref(oldref, orig_sha1, 1, &flag); - if (flag & REF_ISSYMREF) - return error("refname %s is a symbolic ref, renaming it is not supported", - oldref); - if (!symref) - return error("refname %s not found", oldref); - - if (!is_refname_available(newref, oldref, get_packed_refs(NULL), 0)) - return 1; + return refs_for_each_rawref(get_main_ref_store(), fn, cb_data); +} - if (!is_refname_available(newref, oldref, get_loose_refs(NULL), 0)) - return 1; +int refs_read_raw_ref(struct ref_store *ref_store, + const char *refname, unsigned char *sha1, + struct strbuf *referent, unsigned int *type) +{ + return ref_store->be->read_raw_ref(ref_store, refname, sha1, referent, type); +} - lock = lock_ref_sha1_basic(renamed_ref, NULL, 0, NULL); - if (!lock) - return error("unable to lock %s", renamed_ref); - lock->force_write = 1; - if (write_ref_sha1(lock, orig_sha1, logmsg)) - return error("unable to save current sha1 in %s", renamed_ref); +/* This function needs to return a meaningful errno on failure */ +const char *refs_resolve_ref_unsafe(struct ref_store *refs, + const char *refname, + int resolve_flags, + unsigned char *sha1, int *flags) +{ + static struct strbuf sb_refname = STRBUF_INIT; + struct object_id unused_oid; + int unused_flags; + int symref_count; - if (log && rename(git_path("logs/%s", oldref), git_path(TMP_RENAMED_LOG))) - return error("unable to move logfile logs/%s to "TMP_RENAMED_LOG": %s", - oldref, strerror(errno)); + if (!sha1) + sha1 = unused_oid.hash; + if (!flags) + flags = &unused_flags; - if (delete_ref(oldref, orig_sha1, REF_NODEREF)) { - error("unable to delete old %s", oldref); - goto rollback; - } + *flags = 0; - if (resolve_ref(newref, sha1, 1, &flag) && delete_ref(newref, sha1, REF_NODEREF)) { - if (errno==EISDIR) { - if (remove_empty_directories(git_path("%s", newref))) { - error("Directory not empty: %s", newref); - goto rollback; - } - } else { - error("unable to delete existing %s", newref); - goto rollback; + if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) { + if (!(resolve_flags & RESOLVE_REF_ALLOW_BAD_NAME) || + !refname_is_safe(refname)) { + errno = EINVAL; + return NULL; } - } - if (log && safe_create_leading_directories(git_path("logs/%s", newref))) { - error("unable to create directory for %s", newref); - goto rollback; + /* + * dwim_ref() uses REF_ISBROKEN to distinguish between + * missing refs and refs that were present but invalid, + * to complain about the latter to stderr. + * + * We don't know whether the ref exists, so don't set + * REF_ISBROKEN yet. + */ + *flags |= REF_BAD_NAME; } - retry: - if (log && rename(git_path(TMP_RENAMED_LOG), git_path("logs/%s", newref))) { - if (errno==EISDIR || errno==ENOTDIR) { + for (symref_count = 0; symref_count < SYMREF_MAXDEPTH; symref_count++) { + unsigned int read_flags = 0; + + if (refs_read_raw_ref(refs, refname, + sha1, &sb_refname, &read_flags)) { + *flags |= read_flags; + + /* In reading mode, refs must eventually resolve */ + if (resolve_flags & RESOLVE_REF_READING) + return NULL; + /* - * rename(a, b) when b is an existing - * directory ought to result in ISDIR, but - * Solaris 5.8 gives ENOTDIR. Sheesh. + * Otherwise a missing ref is OK. But the files backend + * may show errors besides ENOENT if there are + * similarly-named refs. */ - if (remove_empty_directories(git_path("logs/%s", newref))) { - error("Directory not empty: logs/%s", newref); - goto rollback; + if (errno != ENOENT && + errno != EISDIR && + errno != ENOTDIR) + return NULL; + + hashclr(sha1); + if (*flags & REF_BAD_NAME) + *flags |= REF_ISBROKEN; + return refname; + } + + *flags |= read_flags; + + if (!(read_flags & REF_ISSYMREF)) { + if (*flags & REF_BAD_NAME) { + hashclr(sha1); + *flags |= REF_ISBROKEN; } - goto retry; - } else { - error("unable to move logfile "TMP_RENAMED_LOG" to logs/%s: %s", - newref, strerror(errno)); - goto rollback; + return refname; } - } - logmoved = log; - lock = lock_ref_sha1_basic(newref, NULL, 0, NULL); - if (!lock) { - error("unable to lock %s for update", newref); - goto rollback; - } - lock->force_write = 1; - hashcpy(lock->old_sha1, orig_sha1); - if (write_ref_sha1(lock, orig_sha1, logmsg)) { - error("unable to write current sha1 into %s", newref); - goto rollback; + refname = sb_refname.buf; + if (resolve_flags & RESOLVE_REF_NO_RECURSE) { + hashclr(sha1); + return refname; + } + if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) { + if (!(resolve_flags & RESOLVE_REF_ALLOW_BAD_NAME) || + !refname_is_safe(refname)) { + errno = EINVAL; + return NULL; + } + + *flags |= REF_ISBROKEN | REF_BAD_NAME; + } } - return 0; + errno = ELOOP; + return NULL; +} - rollback: - lock = lock_ref_sha1_basic(oldref, NULL, 0, NULL); - if (!lock) { - error("unable to lock %s for rollback", oldref); - goto rollbacklog; - } +/* backend functions */ +int refs_init_db(struct strbuf *err) +{ + struct ref_store *refs = get_main_ref_store(); - lock->force_write = 1; - flag = log_all_ref_updates; - log_all_ref_updates = 0; - if (write_ref_sha1(lock, orig_sha1, NULL)) - error("unable to write current sha1 into %s", oldref); - log_all_ref_updates = flag; - - rollbacklog: - if (logmoved && rename(git_path("logs/%s", newref), git_path("logs/%s", oldref))) - error("unable to restore logfile %s from %s: %s", - oldref, newref, strerror(errno)); - if (!logmoved && log && - rename(git_path(TMP_RENAMED_LOG), git_path("logs/%s", oldref))) - error("unable to restore logfile %s from "TMP_RENAMED_LOG": %s", - oldref, strerror(errno)); + return refs->be->init_db(refs, err); +} - return 1; +const char *resolve_ref_unsafe(const char *refname, int resolve_flags, + unsigned char *sha1, int *flags) +{ + return refs_resolve_ref_unsafe(get_main_ref_store(), refname, + resolve_flags, sha1, flags); } -int close_ref(struct ref_lock *lock) +int resolve_gitlink_ref(const char *submodule, const char *refname, + unsigned char *sha1) { - if (close_lock_file(lock->lk)) + struct ref_store *refs; + int flags; + + refs = get_submodule_ref_store(submodule); + + if (!refs) + return -1; + + if (!refs_resolve_ref_unsafe(refs, refname, 0, sha1, &flags) || + is_null_sha1(sha1)) return -1; - lock->lock_fd = -1; return 0; } -int commit_ref(struct ref_lock *lock) +struct ref_store_hash_entry { - if (commit_lock_file(lock->lk)) - return -1; - lock->lock_fd = -1; - return 0; + struct hashmap_entry ent; /* must be the first member! */ + + struct ref_store *refs; + + /* NUL-terminated identifier of the ref store: */ + char name[FLEX_ARRAY]; +}; + +static int ref_store_hash_cmp(const void *unused_cmp_data, + const void *entry, const void *entry_or_key, + const void *keydata) +{ + const struct ref_store_hash_entry *e1 = entry, *e2 = entry_or_key; + const char *name = keydata ? keydata : e2->name; + + return strcmp(e1->name, name); } -void unlock_ref(struct ref_lock *lock) +static struct ref_store_hash_entry *alloc_ref_store_hash_entry( + const char *name, struct ref_store *refs) { - /* Do not free lock->lk -- atexit() still looks at them */ - if (lock->lk) - rollback_lock_file(lock->lk); - free(lock->ref_name); - free(lock->orig_ref_name); - free(lock); + struct ref_store_hash_entry *entry; + + FLEX_ALLOC_STR(entry, name, name); + hashmap_entry_init(entry, strhash(name)); + entry->refs = refs; + return entry; } +/* A pointer to the ref_store for the main repository: */ +static struct ref_store *main_ref_store; + +/* A hashmap of ref_stores, stored by submodule name: */ +static struct hashmap submodule_ref_stores; + +/* A hashmap of ref_stores, stored by worktree id: */ +static struct hashmap worktree_ref_stores; + /* - * copy the reflog message msg to buf, which has been allocated sufficiently - * large, while cleaning up the whitespaces. Especially, convert LF to space, - * because reflog file is one line per entry. + * Look up a ref store by name. If that ref_store hasn't been + * registered yet, return NULL. */ -static int copy_msg(char *buf, const char *msg) +static struct ref_store *lookup_ref_store_map(struct hashmap *map, + const char *name) { - char *cp = buf; - char c; - int wasspace = 1; + struct ref_store_hash_entry *entry; - *cp++ = '\t'; - while ((c = *msg++)) { - if (wasspace && isspace(c)) - continue; - wasspace = isspace(c); - if (wasspace) - c = ' '; - *cp++ = c; - } - while (buf < cp && isspace(cp[-1])) - cp--; - *cp++ = '\n'; - return cp - buf; + if (!map->tablesize) + /* It's initialized on demand in register_ref_store(). */ + return NULL; + + entry = hashmap_get_from_hash(map, strhash(name), name); + return entry ? entry->refs : NULL; } -int log_ref_setup(const char *ref_name, char *logfile, int bufsize) +/* + * Create, record, and return a ref_store instance for the specified + * gitdir. + */ +static struct ref_store *ref_store_init(const char *gitdir, + unsigned int flags) { - int logfd, oflags = O_APPEND | O_WRONLY; + const char *be_name = "files"; + struct ref_storage_be *be = find_ref_storage_backend(be_name); + struct ref_store *refs; - git_snpath(logfile, bufsize, "logs/%s", ref_name); - if (log_all_ref_updates && - (!prefixcmp(ref_name, "refs/heads/") || - !prefixcmp(ref_name, "refs/remotes/") || - !prefixcmp(ref_name, "refs/notes/") || - !strcmp(ref_name, "HEAD"))) { - if (safe_create_leading_directories(logfile) < 0) - return error("unable to create directory for %s", - logfile); - oflags |= O_CREAT; - } + if (!be) + die("BUG: reference backend %s is unknown", be_name); - logfd = open(logfile, oflags, 0666); - if (logfd < 0) { - if (!(oflags & O_CREAT) && errno == ENOENT) - return 0; + refs = be->init(gitdir, flags); + return refs; +} - if ((oflags & O_CREAT) && errno == EISDIR) { - if (remove_empty_directories(logfile)) { - return error("There are still logs under '%s'", - logfile); - } - logfd = open(logfile, oflags, 0666); - } +struct ref_store *get_main_ref_store(void) +{ + if (main_ref_store) + return main_ref_store; - if (logfd < 0) - return error("Unable to append to %s: %s", - logfile, strerror(errno)); - } + main_ref_store = ref_store_init(get_git_dir(), REF_STORE_ALL_CAPS); + return main_ref_store; +} - adjust_shared_perm(logfile); - close(logfd); - return 0; +/* + * Associate a ref store with a name. It is a fatal error to call this + * function twice for the same name. + */ +static void register_ref_store_map(struct hashmap *map, + const char *type, + struct ref_store *refs, + const char *name) +{ + if (!map->tablesize) + hashmap_init(map, ref_store_hash_cmp, NULL, 0); + + if (hashmap_put(map, alloc_ref_store_hash_entry(name, refs))) + die("BUG: %s ref_store '%s' initialized twice", type, name); } -static int log_ref_write(const char *ref_name, const unsigned char *old_sha1, - const unsigned char *new_sha1, const char *msg) +struct ref_store *get_submodule_ref_store(const char *submodule) { - int logfd, result, written, oflags = O_APPEND | O_WRONLY; - unsigned maxlen, len; - int msglen; - char log_file[PATH_MAX]; - char *logrec; - const char *committer; + struct strbuf submodule_sb = STRBUF_INIT; + struct ref_store *refs; + char *to_free = NULL; + size_t len; - if (log_all_ref_updates < 0) - log_all_ref_updates = !is_bare_repository(); + if (!submodule) + return NULL; - result = log_ref_setup(ref_name, log_file, sizeof(log_file)); - if (result) - return result; + len = strlen(submodule); + while (len && is_dir_sep(submodule[len - 1])) + len--; + if (!len) + return NULL; - logfd = open(log_file, oflags); - if (logfd < 0) - return 0; - msglen = msg ? strlen(msg) : 0; - committer = git_committer_info(0); - maxlen = strlen(committer) + msglen + 100; - logrec = xmalloc(maxlen); - len = sprintf(logrec, "%s %s %s\n", - sha1_to_hex(old_sha1), - sha1_to_hex(new_sha1), - committer); - if (msglen) - len += copy_msg(logrec + len - 1, msg) - 1; - written = len <= maxlen ? write_in_full(logfd, logrec, len) : -1; - free(logrec); - if (close(logfd) != 0 || written != len) - return error("Unable to append to %s", log_file); - return 0; + if (submodule[len]) + /* We need to strip off one or more trailing slashes */ + submodule = to_free = xmemdupz(submodule, len); + + refs = lookup_ref_store_map(&submodule_ref_stores, submodule); + if (refs) + goto done; + + strbuf_addstr(&submodule_sb, submodule); + if (!is_nonbare_repository_dir(&submodule_sb)) + goto done; + + if (submodule_to_gitdir(&submodule_sb, submodule)) + goto done; + + /* assume that add_submodule_odb() has been called */ + refs = ref_store_init(submodule_sb.buf, + REF_STORE_READ | REF_STORE_ODB); + register_ref_store_map(&submodule_ref_stores, "submodule", + refs, submodule); + +done: + strbuf_release(&submodule_sb); + free(to_free); + + return refs; +} + +struct ref_store *get_worktree_ref_store(const struct worktree *wt) +{ + struct ref_store *refs; + const char *id; + + if (wt->is_current) + return get_main_ref_store(); + + id = wt->id ? wt->id : "/"; + refs = lookup_ref_store_map(&worktree_ref_stores, id); + if (refs) + return refs; + + if (wt->id) + refs = ref_store_init(git_common_path("worktrees/%s", wt->id), + REF_STORE_ALL_CAPS); + else + refs = ref_store_init(get_git_common_dir(), + REF_STORE_ALL_CAPS); + + if (refs) + register_ref_store_map(&worktree_ref_stores, "worktree", + refs, id); + return refs; } -static int is_branch(const char *refname) +void base_ref_store_init(struct ref_store *refs, + const struct ref_storage_be *be) { - return !strcmp(refname, "HEAD") || !prefixcmp(refname, "refs/heads/"); + refs->be = be; } -int write_ref_sha1(struct ref_lock *lock, - const unsigned char *sha1, const char *logmsg) +/* backend functions */ +int refs_pack_refs(struct ref_store *refs, unsigned int flags) { - static char term = '\n'; - struct object *o; + return refs->be->pack_refs(refs, flags); +} - if (!lock) - return -1; - if (!lock->force_write && !hashcmp(lock->old_sha1, sha1)) { - unlock_ref(lock); +int refs_peel_ref(struct ref_store *refs, const char *refname, + unsigned char *sha1) +{ + int flag; + unsigned char base[20]; + + if (current_ref_iter && current_ref_iter->refname == refname) { + struct object_id peeled; + + if (ref_iterator_peel(current_ref_iter, &peeled)) + return -1; + hashcpy(sha1, peeled.hash); return 0; } - o = parse_object(sha1); - if (!o) { - error("Trying to write ref %s with nonexistant object %s", - lock->ref_name, sha1_to_hex(sha1)); - unlock_ref(lock); - return -1; - } - if (o->type != OBJ_COMMIT && is_branch(lock->ref_name)) { - error("Trying to write non-commit object %s to branch %s", - sha1_to_hex(sha1), lock->ref_name); - unlock_ref(lock); - return -1; - } - if (write_in_full(lock->lock_fd, sha1_to_hex(sha1), 40) != 40 || - write_in_full(lock->lock_fd, &term, 1) != 1 - || close_ref(lock) < 0) { - error("Couldn't write %s", lock->lk->filename); - unlock_ref(lock); - return -1; - } - invalidate_cached_refs(); - if (log_ref_write(lock->ref_name, lock->old_sha1, sha1, logmsg) < 0 || - (strcmp(lock->ref_name, lock->orig_ref_name) && - log_ref_write(lock->orig_ref_name, lock->old_sha1, sha1, logmsg) < 0)) { - unlock_ref(lock); - return -1; - } - if (strcmp(lock->orig_ref_name, "HEAD") != 0) { - /* - * Special hack: If a branch is updated directly and HEAD - * points to it (may happen on the remote side of a push - * for example) then logically the HEAD reflog should be - * updated too. - * A generic solution implies reverse symref information, - * but finding all symrefs pointing to the given branch - * would be rather costly for this rare event (the direct - * update of a branch) to be worth it. So let's cheat and - * check with HEAD only which should cover 99% of all usage - * scenarios (even 100% of the default ones). - */ - unsigned char head_sha1[20]; - int head_flag; - const char *head_ref; - head_ref = resolve_ref("HEAD", head_sha1, 1, &head_flag); - if (head_ref && (head_flag & REF_ISSYMREF) && - !strcmp(head_ref, lock->ref_name)) - log_ref_write("HEAD", lock->old_sha1, sha1, logmsg); - } - if (commit_ref(lock)) { - error("Couldn't set %s", lock->ref_name); - unlock_ref(lock); + + if (refs_read_ref_full(refs, refname, + RESOLVE_REF_READING, base, &flag)) return -1; - } - unlock_ref(lock); - return 0; + + return peel_object(base, sha1); +} + +int peel_ref(const char *refname, unsigned char *sha1) +{ + return refs_peel_ref(get_main_ref_store(), refname, sha1); +} + +int refs_create_symref(struct ref_store *refs, + const char *ref_target, + const char *refs_heads_master, + const char *logmsg) +{ + return refs->be->create_symref(refs, ref_target, + refs_heads_master, + logmsg); } int create_symref(const char *ref_target, const char *refs_heads_master, const char *logmsg) { - const char *lockpath; - char ref[1000]; - int fd, len, written; - char *git_HEAD = git_pathdup("%s", ref_target); - unsigned char old_sha1[20], new_sha1[20]; + return refs_create_symref(get_main_ref_store(), ref_target, + refs_heads_master, logmsg); +} - if (logmsg && read_ref(ref_target, old_sha1)) - hashclr(old_sha1); +int ref_update_reject_duplicates(struct string_list *refnames, + struct strbuf *err) +{ + size_t i, n = refnames->nr; - if (safe_create_leading_directories(git_HEAD) < 0) - return error("unable to create directory for %s", git_HEAD); + assert(err); -#ifndef NO_SYMLINK_HEAD - if (prefer_symlink_refs) { - unlink(git_HEAD); - if (!symlink(refs_heads_master, git_HEAD)) - goto done; - fprintf(stderr, "no symlink - falling back to symbolic ref\n"); - } -#endif + for (i = 1; i < n; i++) { + int cmp = strcmp(refnames->items[i - 1].string, + refnames->items[i].string); - len = snprintf(ref, sizeof(ref), "ref: %s\n", refs_heads_master); - if (sizeof(ref) <= len) { - error("refname too long: %s", refs_heads_master); - goto error_free_return; - } - lockpath = mkpath("%s.lock", git_HEAD); - fd = open(lockpath, O_CREAT | O_EXCL | O_WRONLY, 0666); - if (fd < 0) { - error("Unable to open %s for writing", lockpath); - goto error_free_return; - } - written = write_in_full(fd, ref, len); - if (close(fd) != 0 || written != len) { - error("Unable to write to %s", lockpath); - goto error_unlink_return; - } - if (rename(lockpath, git_HEAD) < 0) { - error("Unable to create %s", git_HEAD); - goto error_unlink_return; - } - if (adjust_shared_perm(git_HEAD)) { - error("Unable to fix permissions on %s", lockpath); - error_unlink_return: - unlink_or_warn(lockpath); - error_free_return: - free(git_HEAD); - return -1; + if (!cmp) { + strbuf_addf(err, + "multiple updates for ref '%s' not allowed.", + refnames->items[i].string); + return 1; + } else if (cmp > 0) { + die("BUG: ref_update_reject_duplicates() received unsorted list"); + } } - -#ifndef NO_SYMLINK_HEAD - done: -#endif - if (logmsg && !read_ref(refs_heads_master, new_sha1)) - log_ref_write(ref_target, old_sha1, new_sha1, logmsg); - - free(git_HEAD); return 0; } -static char *ref_msg(const char *line, const char *endp) -{ - const char *ep; - line += 82; - ep = memchr(line, '\n', endp - line); - if (!ep) - ep = endp; - return xmemdupz(line, ep - line); -} - -int read_ref_at(const char *ref, unsigned long at_time, int cnt, unsigned char *sha1, char **msg, unsigned long *cutoff_time, int *cutoff_tz, int *cutoff_cnt) -{ - const char *logfile, *logdata, *logend, *rec, *lastgt, *lastrec; - char *tz_c; - int logfd, tz, reccnt = 0; - struct stat st; - unsigned long date; - unsigned char logged_sha1[20]; - void *log_mapped; - size_t mapsz; - - logfile = git_path("logs/%s", ref); - logfd = open(logfile, O_RDONLY, 0); - if (logfd < 0) - die_errno("Unable to read log '%s'", logfile); - fstat(logfd, &st); - if (!st.st_size) - die("Log %s is empty.", logfile); - mapsz = xsize_t(st.st_size); - log_mapped = xmmap(NULL, mapsz, PROT_READ, MAP_PRIVATE, logfd, 0); - logdata = log_mapped; - close(logfd); - - lastrec = NULL; - rec = logend = logdata + st.st_size; - while (logdata < rec) { - reccnt++; - if (logdata < rec && *(rec-1) == '\n') - rec--; - lastgt = NULL; - while (logdata < rec && *(rec-1) != '\n') { - rec--; - if (*rec == '>') - lastgt = rec; - } - if (!lastgt) - die("Log %s is corrupt.", logfile); - date = strtoul(lastgt + 1, &tz_c, 10); - if (date <= at_time || cnt == 0) { - tz = strtoul(tz_c, NULL, 10); - if (msg) - *msg = ref_msg(rec, logend); - if (cutoff_time) - *cutoff_time = date; - if (cutoff_tz) - *cutoff_tz = tz; - if (cutoff_cnt) - *cutoff_cnt = reccnt - 1; - if (lastrec) { - if (get_sha1_hex(lastrec, logged_sha1)) - die("Log %s is corrupt.", logfile); - if (get_sha1_hex(rec + 41, sha1)) - die("Log %s is corrupt.", logfile); - if (hashcmp(logged_sha1, sha1)) { - warning("Log %s has gap after %s.", - logfile, show_date(date, tz, DATE_RFC2822)); - } - } - else if (date == at_time) { - if (get_sha1_hex(rec + 41, sha1)) - die("Log %s is corrupt.", logfile); - } - else { - if (get_sha1_hex(rec + 41, logged_sha1)) - die("Log %s is corrupt.", logfile); - if (hashcmp(logged_sha1, sha1)) { - warning("Log %s unexpectedly ended on %s.", - logfile, show_date(date, tz, DATE_RFC2822)); - } - } - munmap(log_mapped, mapsz); - return 0; - } - lastrec = rec; - if (cnt > 0) - cnt--; +int ref_transaction_prepare(struct ref_transaction *transaction, + struct strbuf *err) +{ + struct ref_store *refs = transaction->ref_store; + + switch (transaction->state) { + case REF_TRANSACTION_OPEN: + /* Good. */ + break; + case REF_TRANSACTION_PREPARED: + die("BUG: prepare called twice on reference transaction"); + break; + case REF_TRANSACTION_CLOSED: + die("BUG: prepare called on a closed reference transaction"); + break; + default: + die("BUG: unexpected reference transaction state"); + break; } - rec = logdata; - while (rec < logend && *rec != '>' && *rec != '\n') - rec++; - if (rec == logend || *rec == '\n') - die("Log %s is corrupt.", logfile); - date = strtoul(rec + 1, &tz_c, 10); - tz = strtoul(tz_c, NULL, 10); - if (get_sha1_hex(logdata, sha1)) - die("Log %s is corrupt.", logfile); - if (is_null_sha1(sha1)) { - if (get_sha1_hex(logdata + 41, sha1)) - die("Log %s is corrupt.", logfile); + if (getenv(GIT_QUARANTINE_ENVIRONMENT)) { + strbuf_addstr(err, + _("ref updates forbidden inside quarantine environment")); + return -1; } - if (msg) - *msg = ref_msg(logdata, logend); - munmap(log_mapped, mapsz); - - if (cutoff_time) - *cutoff_time = date; - if (cutoff_tz) - *cutoff_tz = tz; - if (cutoff_cnt) - *cutoff_cnt = reccnt; - return 1; + + return refs->be->transaction_prepare(refs, transaction, err); } -int for_each_recent_reflog_ent(const char *ref, each_reflog_ent_fn fn, long ofs, void *cb_data) +int ref_transaction_abort(struct ref_transaction *transaction, + struct strbuf *err) { - const char *logfile; - FILE *logfp; - struct strbuf sb = STRBUF_INIT; + struct ref_store *refs = transaction->ref_store; int ret = 0; - logfile = git_path("logs/%s", ref); - logfp = fopen(logfile, "r"); - if (!logfp) - return -1; - - if (ofs) { - struct stat statbuf; - if (fstat(fileno(logfp), &statbuf) || - statbuf.st_size < ofs || - fseek(logfp, -ofs, SEEK_END) || - strbuf_getwholeline(&sb, logfp, '\n')) { - fclose(logfp); - strbuf_release(&sb); - return -1; - } + switch (transaction->state) { + case REF_TRANSACTION_OPEN: + /* No need to abort explicitly. */ + break; + case REF_TRANSACTION_PREPARED: + ret = refs->be->transaction_abort(refs, transaction, err); + break; + case REF_TRANSACTION_CLOSED: + die("BUG: abort called on a closed reference transaction"); + break; + default: + die("BUG: unexpected reference transaction state"); + break; } - while (!strbuf_getwholeline(&sb, logfp, '\n')) { - unsigned char osha1[20], nsha1[20]; - char *email_end, *message; - unsigned long timestamp; - int tz; - - /* old SP new SP name <email> SP time TAB msg LF */ - if (sb.len < 83 || sb.buf[sb.len - 1] != '\n' || - get_sha1_hex(sb.buf, osha1) || sb.buf[40] != ' ' || - get_sha1_hex(sb.buf + 41, nsha1) || sb.buf[81] != ' ' || - !(email_end = strchr(sb.buf + 82, '>')) || - email_end[1] != ' ' || - !(timestamp = strtoul(email_end + 2, &message, 10)) || - !message || message[0] != ' ' || - (message[1] != '+' && message[1] != '-') || - !isdigit(message[2]) || !isdigit(message[3]) || - !isdigit(message[4]) || !isdigit(message[5])) - continue; /* corrupt? */ - email_end[1] = '\0'; - tz = strtol(message + 1, NULL, 10); - if (message[6] != '\t') - message += 6; - else - message += 7; - ret = fn(osha1, nsha1, sb.buf + 82, timestamp, tz, message, - cb_data); - if (ret) - break; - } - fclose(logfp); - strbuf_release(&sb); + ref_transaction_free(transaction); return ret; } -int for_each_reflog_ent(const char *ref, each_reflog_ent_fn fn, void *cb_data) +int ref_transaction_commit(struct ref_transaction *transaction, + struct strbuf *err) { - return for_each_recent_reflog_ent(ref, fn, 0, cb_data); + struct ref_store *refs = transaction->ref_store; + int ret; + + switch (transaction->state) { + case REF_TRANSACTION_OPEN: + /* Need to prepare first. */ + ret = ref_transaction_prepare(transaction, err); + if (ret) + return ret; + break; + case REF_TRANSACTION_PREPARED: + /* Fall through to finish. */ + break; + case REF_TRANSACTION_CLOSED: + die("BUG: commit called on a closed reference transaction"); + break; + default: + die("BUG: unexpected reference transaction state"); + break; + } + + return refs->be->transaction_finish(refs, transaction, err); } -static int do_for_each_reflog(const char *base, each_ref_fn fn, void *cb_data) +int refs_verify_refname_available(struct ref_store *refs, + const char *refname, + const struct string_list *extras, + const struct string_list *skip, + struct strbuf *err) { - DIR *dir = opendir(git_path("logs/%s", base)); - int retval = 0; + const char *slash; + const char *extra_refname; + struct strbuf dirname = STRBUF_INIT; + struct strbuf referent = STRBUF_INIT; + struct object_id oid; + unsigned int type; + struct ref_iterator *iter; + int ok; + int ret = -1; - if (dir) { - struct dirent *de; - int baselen = strlen(base); - char *log = xmalloc(baselen + 257); + /* + * For the sake of comments in this function, suppose that + * refname is "refs/foo/bar". + */ - memcpy(log, base, baselen); - if (baselen && base[baselen-1] != '/') - log[baselen++] = '/'; + assert(err); - while ((de = readdir(dir)) != NULL) { - struct stat st; - int namelen; + strbuf_grow(&dirname, strlen(refname) + 1); + for (slash = strchr(refname, '/'); slash; slash = strchr(slash + 1, '/')) { + /* Expand dirname to the new prefix, not including the trailing slash: */ + strbuf_add(&dirname, refname + dirname.len, slash - refname - dirname.len); - if (de->d_name[0] == '.') - continue; - namelen = strlen(de->d_name); - if (namelen > 255) - continue; - if (has_extension(de->d_name, ".lock")) - continue; - memcpy(log + baselen, de->d_name, namelen+1); - if (stat(git_path("logs/%s", log), &st) < 0) - continue; - if (S_ISDIR(st.st_mode)) { - retval = do_for_each_reflog(log, fn, cb_data); - } else { - unsigned char sha1[20]; - if (!resolve_ref(log, sha1, 0, NULL)) - retval = error("bad ref for %s", log); - else - retval = fn(log, sha1, 0, cb_data); - } - if (retval) - break; + /* + * We are still at a leading dir of the refname (e.g., + * "refs/foo"; if there is a reference with that name, + * it is a conflict, *unless* it is in skip. + */ + if (skip && string_list_has_string(skip, dirname.buf)) + continue; + + if (!refs_read_raw_ref(refs, dirname.buf, oid.hash, &referent, &type)) { + strbuf_addf(err, "'%s' exists; cannot create '%s'", + dirname.buf, refname); + goto cleanup; + } + + if (extras && string_list_has_string(extras, dirname.buf)) { + strbuf_addf(err, "cannot process '%s' and '%s' at the same time", + refname, dirname.buf); + goto cleanup; } - free(log); - closedir(dir); } - else if (*base) - return errno; - return retval; + + /* + * We are at the leaf of our refname (e.g., "refs/foo/bar"). + * There is no point in searching for a reference with that + * name, because a refname isn't considered to conflict with + * itself. But we still need to check for references whose + * names are in the "refs/foo/bar/" namespace, because they + * *do* conflict. + */ + strbuf_addstr(&dirname, refname + dirname.len); + strbuf_addch(&dirname, '/'); + + iter = refs_ref_iterator_begin(refs, dirname.buf, 0, + DO_FOR_EACH_INCLUDE_BROKEN); + while ((ok = ref_iterator_advance(iter)) == ITER_OK) { + if (skip && + string_list_has_string(skip, iter->refname)) + continue; + + strbuf_addf(err, "'%s' exists; cannot create '%s'", + iter->refname, refname); + ref_iterator_abort(iter); + goto cleanup; + } + + if (ok != ITER_DONE) + die("BUG: error while iterating over references"); + + extra_refname = find_descendant_ref(dirname.buf, extras, skip); + if (extra_refname) + strbuf_addf(err, "cannot process '%s' and '%s' at the same time", + refname, extra_refname); + else + ret = 0; + +cleanup: + strbuf_release(&referent); + strbuf_release(&dirname); + return ret; } -int for_each_reflog(each_ref_fn fn, void *cb_data) +int refs_for_each_reflog(struct ref_store *refs, each_ref_fn fn, void *cb_data) { - return do_for_each_reflog("", fn, cb_data); + struct ref_iterator *iter; + + iter = refs->be->reflog_iterator_begin(refs); + + return do_for_each_ref_iterator(iter, fn, cb_data); } -int update_ref(const char *action, const char *refname, - const unsigned char *sha1, const unsigned char *oldval, - int flags, enum action_on_err onerr) +int for_each_reflog(each_ref_fn fn, void *cb_data) { - static struct ref_lock *lock; - lock = lock_any_ref_for_update(refname, oldval, flags); - if (!lock) { - const char *str = "Cannot lock the ref '%s'."; - switch (onerr) { - case MSG_ON_ERR: error(str, refname); break; - case DIE_ON_ERR: die(str, refname); break; - case QUIET_ON_ERR: break; - } - return 1; - } - if (write_ref_sha1(lock, sha1, action) < 0) { - const char *str = "Cannot update the ref '%s'."; - switch (onerr) { - case MSG_ON_ERR: error(str, refname); break; - case DIE_ON_ERR: die(str, refname); break; - case QUIET_ON_ERR: break; - } - return 1; - } - return 0; + return refs_for_each_reflog(get_main_ref_store(), fn, cb_data); } -struct ref *find_ref_by_name(const struct ref *list, const char *name) +int refs_for_each_reflog_ent_reverse(struct ref_store *refs, + const char *refname, + each_reflog_ent_fn fn, + void *cb_data) { - for ( ; list; list = list->next) - if (!strcmp(list->name, name)) - return (struct ref *)list; - return NULL; + return refs->be->for_each_reflog_ent_reverse(refs, refname, + fn, cb_data); } -/* - * generate a format suitable for scanf from a ref_rev_parse_rules - * rule, that is replace the "%.*s" spec with a "%s" spec - */ -static void gen_scanf_fmt(char *scanf_fmt, const char *rule) +int for_each_reflog_ent_reverse(const char *refname, each_reflog_ent_fn fn, + void *cb_data) { - char *spec; - - spec = strstr(rule, "%.*s"); - if (!spec || strstr(spec + 4, "%.*s")) - die("invalid rule in ref_rev_parse_rules: %s", rule); + return refs_for_each_reflog_ent_reverse(get_main_ref_store(), + refname, fn, cb_data); +} - /* copy all until spec */ - strncpy(scanf_fmt, rule, spec - rule); - scanf_fmt[spec - rule] = '\0'; - /* copy new spec */ - strcat(scanf_fmt, "%s"); - /* copy remaining rule */ - strcat(scanf_fmt, spec + 4); +int refs_for_each_reflog_ent(struct ref_store *refs, const char *refname, + each_reflog_ent_fn fn, void *cb_data) +{ + return refs->be->for_each_reflog_ent(refs, refname, fn, cb_data); +} - return; +int for_each_reflog_ent(const char *refname, each_reflog_ent_fn fn, + void *cb_data) +{ + return refs_for_each_reflog_ent(get_main_ref_store(), refname, + fn, cb_data); } -char *shorten_unambiguous_ref(const char *ref, int strict) +int refs_reflog_exists(struct ref_store *refs, const char *refname) { - int i; - static char **scanf_fmts; - static int nr_rules; - char *short_name; + return refs->be->reflog_exists(refs, refname); +} - /* pre generate scanf formats from ref_rev_parse_rules[] */ - if (!nr_rules) { - size_t total_len = 0; +int reflog_exists(const char *refname) +{ + return refs_reflog_exists(get_main_ref_store(), refname); +} - /* the rule list is NULL terminated, count them first */ - for (; ref_rev_parse_rules[nr_rules]; nr_rules++) - /* no +1 because strlen("%s") < strlen("%.*s") */ - total_len += strlen(ref_rev_parse_rules[nr_rules]); +int refs_create_reflog(struct ref_store *refs, const char *refname, + int force_create, struct strbuf *err) +{ + return refs->be->create_reflog(refs, refname, force_create, err); +} - scanf_fmts = xmalloc(nr_rules * sizeof(char *) + total_len); +int safe_create_reflog(const char *refname, int force_create, + struct strbuf *err) +{ + return refs_create_reflog(get_main_ref_store(), refname, + force_create, err); +} - total_len = 0; - for (i = 0; i < nr_rules; i++) { - scanf_fmts[i] = (char *)&scanf_fmts[nr_rules] - + total_len; - gen_scanf_fmt(scanf_fmts[i], ref_rev_parse_rules[i]); - total_len += strlen(ref_rev_parse_rules[i]); - } - } +int refs_delete_reflog(struct ref_store *refs, const char *refname) +{ + return refs->be->delete_reflog(refs, refname); +} - /* bail out if there are no rules */ - if (!nr_rules) - return xstrdup(ref); +int delete_reflog(const char *refname) +{ + return refs_delete_reflog(get_main_ref_store(), refname); +} - /* buffer for scanf result, at most ref must fit */ - short_name = xstrdup(ref); +int refs_reflog_expire(struct ref_store *refs, + const char *refname, const unsigned char *sha1, + unsigned int flags, + reflog_expiry_prepare_fn prepare_fn, + reflog_expiry_should_prune_fn should_prune_fn, + reflog_expiry_cleanup_fn cleanup_fn, + void *policy_cb_data) +{ + return refs->be->reflog_expire(refs, refname, sha1, flags, + prepare_fn, should_prune_fn, + cleanup_fn, policy_cb_data); +} - /* skip first rule, it will always match */ - for (i = nr_rules - 1; i > 0 ; --i) { - int j; - int rules_to_fail = i; - int short_name_len; +int reflog_expire(const char *refname, const unsigned char *sha1, + unsigned int flags, + reflog_expiry_prepare_fn prepare_fn, + reflog_expiry_should_prune_fn should_prune_fn, + reflog_expiry_cleanup_fn cleanup_fn, + void *policy_cb_data) +{ + return refs_reflog_expire(get_main_ref_store(), + refname, sha1, flags, + prepare_fn, should_prune_fn, + cleanup_fn, policy_cb_data); +} - if (1 != sscanf(ref, scanf_fmts[i], short_name)) - continue; +int initial_ref_transaction_commit(struct ref_transaction *transaction, + struct strbuf *err) +{ + struct ref_store *refs = transaction->ref_store; - short_name_len = strlen(short_name); + return refs->be->initial_transaction_commit(refs, transaction, err); +} - /* - * in strict mode, all (except the matched one) rules - * must fail to resolve to a valid non-ambiguous ref - */ - if (strict) - rules_to_fail = nr_rules; +int refs_delete_refs(struct ref_store *refs, const char *msg, + struct string_list *refnames, unsigned int flags) +{ + return refs->be->delete_refs(refs, msg, refnames, flags); +} - /* - * check if the short name resolves to a valid ref, - * but use only rules prior to the matched one - */ - for (j = 0; j < rules_to_fail; j++) { - const char *rule = ref_rev_parse_rules[j]; - unsigned char short_objectname[20]; - char refname[PATH_MAX]; +int delete_refs(const char *msg, struct string_list *refnames, + unsigned int flags) +{ + return refs_delete_refs(get_main_ref_store(), msg, refnames, flags); +} - /* skip matched rule */ - if (i == j) - continue; +int refs_rename_ref(struct ref_store *refs, const char *oldref, + const char *newref, const char *logmsg) +{ + return refs->be->rename_ref(refs, oldref, newref, logmsg); +} - /* - * the short name is ambiguous, if it resolves - * (with this previous rule) to a valid ref - * read_ref() returns 0 on success - */ - mksnpath(refname, sizeof(refname), - rule, short_name_len, short_name); - if (!read_ref(refname, short_objectname)) - break; - } +int rename_ref(const char *oldref, const char *newref, const char *logmsg) +{ + return refs_rename_ref(get_main_ref_store(), oldref, newref, logmsg); +} - /* - * short name is non-ambiguous if all previous rules - * haven't resolved to a valid ref - */ - if (j == rules_to_fail) - return short_name; - } +int refs_copy_existing_ref(struct ref_store *refs, const char *oldref, + const char *newref, const char *logmsg) +{ + return refs->be->copy_ref(refs, oldref, newref, logmsg); +} - free(short_name); - return xstrdup(ref); +int copy_existing_ref(const char *oldref, const char *newref, const char *logmsg) +{ + return refs_copy_existing_ref(get_main_ref_store(), oldref, newref, logmsg); } |