From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 21 Sep 2016 22:15:20 +0000 (-0700)
Subject: Merge branch 'jk/delta-base-cache'
X-Git-Tag: v2.11.0-rc0~136
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/13307145a97c7028403801fc4ead26bff794cead?hp=-c

Merge branch 'jk/delta-base-cache'

Recently we updated the code to manage the in-core cache that holds
objects that have recently been used to reconstitute other objects
that are stored as deltas against them, but the update used an
incorrect API function to manage the list of these objects.  This
has been fixed.

* jk/delta-base-cache:
add_delta_base_cache: use list_for_each_safe
---

13307145a97c7028403801fc4ead26bff794cead
diff --combined sha1_file.c
index 472ccb2ff9,132c861fdb..46b25edcb3
--- a/sha1_file.c
+++ b/sha1_file.c
@@@ -39,12 -39,6 +39,12 @@@ static inline uintmax_t sz_fmt(size_t s
  
  const unsigned char null_sha1[20];
  const struct object_id null_oid;
 +const struct object_id empty_tree_oid = {
 +	EMPTY_TREE_SHA1_BIN_LITERAL
 +};
 +const struct object_id empty_blob_oid = {
 +	EMPTY_BLOB_SHA1_BIN_LITERAL
 +};
  
  /*
   * This is meant to hold a *small* number of objects that you would
@@@ -425,82 -419,6 +425,82 @@@ void add_to_alternates_file(const char 
  	free(alts);
  }
  
 +/*
 + * Compute the exact path an alternate is at and returns it. In case of
 + * error NULL is returned and the human readable error is added to `err`
 + * `path` may be relative and should point to $GITDIR.
 + * `err` must not be null.
 + */
 +char *compute_alternate_path(const char *path, struct strbuf *err)
 +{
 +	char *ref_git = NULL;
 +	const char *repo, *ref_git_s;
 +	int seen_error = 0;
 +
 +	ref_git_s = real_path_if_valid(path);
 +	if (!ref_git_s) {
 +		seen_error = 1;
 +		strbuf_addf(err, _("path '%s' does not exist"), path);
 +		goto out;
 +	} else
 +		/*
 +		 * Beware: read_gitfile(), real_path() and mkpath()
 +		 * return static buffer
 +		 */
 +		ref_git = xstrdup(ref_git_s);
 +
 +	repo = read_gitfile(ref_git);
 +	if (!repo)
 +		repo = read_gitfile(mkpath("%s/.git", ref_git));
 +	if (repo) {
 +		free(ref_git);
 +		ref_git = xstrdup(repo);
 +	}
 +
 +	if (!repo && is_directory(mkpath("%s/.git/objects", ref_git))) {
 +		char *ref_git_git = mkpathdup("%s/.git", ref_git);
 +		free(ref_git);
 +		ref_git = ref_git_git;
 +	} else if (!is_directory(mkpath("%s/objects", ref_git))) {
 +		struct strbuf sb = STRBUF_INIT;
 +		seen_error = 1;
 +		if (get_common_dir(&sb, ref_git)) {
 +			strbuf_addf(err,
 +				    _("reference repository '%s' as a linked "
 +				      "checkout is not supported yet."),
 +				    path);
 +			goto out;
 +		}
 +
 +		strbuf_addf(err, _("reference repository '%s' is not a "
 +					"local repository."), path);
 +		goto out;
 +	}
 +
 +	if (!access(mkpath("%s/shallow", ref_git), F_OK)) {
 +		strbuf_addf(err, _("reference repository '%s' is shallow"),
 +			    path);
 +		seen_error = 1;
 +		goto out;
 +	}
 +
 +	if (!access(mkpath("%s/info/grafts", ref_git), F_OK)) {
 +		strbuf_addf(err,
 +			    _("reference repository '%s' is grafted"),
 +			    path);
 +		seen_error = 1;
 +		goto out;
 +	}
 +
 +out:
 +	if (seen_error) {
 +		free(ref_git);
 +		ref_git = NULL;
 +	}
 +
 +	return ref_git;
 +}
 +
  int foreach_alt_odb(alt_odb_fn fn, void *cb)
  {
  	struct alternate_object_database *ent;
@@@ -2269,11 -2187,11 +2269,11 @@@ static void add_delta_base_cache(struc
  	void *base, unsigned long base_size, enum object_type type)
  {
  	struct delta_base_cache_entry *ent = xmalloc(sizeof(*ent));
- 	struct list_head *lru;
+ 	struct list_head *lru, *tmp;
  
  	delta_base_cached += base_size;
  
- 	list_for_each(lru, &delta_base_cache_lru) {
+ 	list_for_each_safe(lru, tmp, &delta_base_cache_lru) {
  		struct delta_base_cache_entry *f =
  			list_entry(lru, struct delta_base_cache_entry, lru);
  		if (delta_base_cached <= delta_base_cache_limit)