From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 24 Jan 2013 05:19:06 +0000 (-0800)
Subject: Merge branch 'rs/clarify-entry-cmp-sslice'
X-Git-Tag: v1.8.2-rc0~90
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f12e49ae877ad0644b9b9939b7cb742da98691d2?ds=inline;hp=-c

Merge branch 'rs/clarify-entry-cmp-sslice'

* rs/clarify-entry-cmp-sslice:
refs: use strncmp() instead of strlen() and memcmp()
---

f12e49ae877ad0644b9b9939b7cb742da98691d2
diff --combined refs.c
index 541fec2065,257472f8e4..2962825308
--- a/refs.c
+++ b/refs.c
@@@ -259,13 -259,8 +259,13 @@@ static void clear_ref_dir(struct ref_di
  
  static void free_ref_entry(struct ref_entry *entry)
  {
 -	if (entry->flag & REF_DIR)
 -		clear_ref_dir(get_ref_dir(entry));
 +	if (entry->flag & REF_DIR) {
 +		/*
 +		 * Do not use get_ref_dir() here, as that might
 +		 * trigger the reading of loose refs.
 +		 */
 +		clear_ref_dir(&entry->u.subdir);
 +	}
  	free(entry);
  }
  
@@@ -278,12 -273,6 +278,12 @@@ static void add_entry_to_dir(struct ref
  {
  	ALLOC_GROW(dir->entries, dir->nr + 1, dir->alloc);
  	dir->entries[dir->nr++] = entry;
 +	/* optimize for the case that entries are added in order */
 +	if (dir->nr == 1 ||
 +	    (dir->nr == dir->sorted + 1 &&
 +	     strcmp(dir->entries[dir->nr - 2]->name,
 +		    dir->entries[dir->nr - 1]->name) < 0))
 +		dir->sorted = dir->nr;
  }
  
  /*
@@@ -333,14 -322,12 +333,12 @@@ struct string_slice 
  
  static int ref_entry_cmp_sslice(const void *key_, const void *ent_)
  {
- 	struct string_slice *key = (struct string_slice *)key_;
- 	struct ref_entry *ent = *(struct ref_entry **)ent_;
- 	int entlen = strlen(ent->name);
- 	int cmplen = key->len < entlen ? key->len : entlen;
- 	int cmp = memcmp(key->str, ent->name, cmplen);
+ 	const struct string_slice *key = key_;
+ 	const struct ref_entry *ent = *(const struct ref_entry * const *)ent_;
+ 	int cmp = strncmp(key->str, ent->name, key->len);
  	if (cmp)
  		return cmp;
- 	return key->len - entlen;
+ 	return '\0' - (unsigned char)ent->name[key->len];
  }
  
  /*
@@@ -1202,8 -1189,6 +1200,8 @@@ int peel_ref(const char *refname, unsig
  	if (current_ref && (current_ref->name == refname
  		|| !strcmp(current_ref->name, refname))) {
  		if (current_ref->flag & REF_KNOWS_PEELED) {
 +			if (is_null_sha1(current_ref->u.value.peeled))
 +			    return -1;
  			hashcpy(sha1, current_ref->u.value.peeled);
  			return 0;
  		}
@@@ -1225,16 -1210,9 +1223,16 @@@
  	}
  
  fallback:
 -	o = parse_object(base);
 -	if (o && o->type == OBJ_TAG) {
 -		o = deref_tag(o, refname, 0);
 +	o = lookup_unknown_object(base);
 +	if (o->type == OBJ_NONE) {
 +		int type = sha1_object_info(base, NULL);
 +		if (type < 0)
 +			return -1;
 +		o->type = type;
 +	}
 +
 +	if (o->type == OBJ_TAG) {
 +		o = deref_tag_noverify(o);
  		if (o) {
  			hashcpy(sha1, o->sha1);
  			return 0;
@@@ -1744,8 -1722,7 +1742,8 @@@ static struct lock_file packlock
  static int repack_without_ref(const char *refname)
  {
  	struct repack_without_ref_sb data;
 -	struct ref_dir *packed = get_packed_refs(get_ref_cache(NULL));
 +	struct ref_cache *refs = get_ref_cache(NULL);
 +	struct ref_dir *packed = get_packed_refs(refs);
  	if (find_ref(packed, refname) == NULL)
  		return 0;
  	data.refname = refname;
@@@ -1754,8 -1731,6 +1752,8 @@@
  		unable_to_lock_error(git_path("packed-refs"), errno);
  		return error("cannot delete '%s' from packed refs", refname);
  	}
 +	clear_packed_ref_cache(refs);
 +	packed = get_packed_refs(refs);
  	do_for_each_ref_in_dir(packed, 0, "", repack_without_ref_fn, 0, 0, &data);
  	return commit_lock_file(&packlock);
  }
@@@ -1765,24 -1740,32 +1763,24 @@@ int delete_ref(const char *refname, con
  	struct ref_lock *lock;
  	int err, i = 0, ret = 0, flag = 0;
  
 -	lock = lock_ref_sha1_basic(refname, sha1, 0, &flag);
 +	lock = lock_ref_sha1_basic(refname, sha1, delopt, &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);
 +		i = strlen(lock->lk->filename) - 5; /* .lock */
 +		lock->lk->filename[i] = 0;
 +		err = unlink_or_warn(lock->lk->filename);
  		if (err && errno != ENOENT)
  			ret = 1;
  
 -		if (!(delopt & REF_NODEREF))
 -			lock->lk->filename[i] = '.';
 +		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);
 +	ret |= repack_without_ref(lock->ref_name);
  
  	unlink_or_warn(git_path("logs/%s", lock->ref_name));
  	invalidate_ref_cache(NULL);