From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 22 Dec 2010 00:46:52 +0000 (-0800)
Subject: Merge branch 'tf/commit-list-prefix' into next
X-Git-Tag: ko-next~48
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=16e1351eaa9eb73c75c27e5c308d781b2ced215f;p=git.git

Merge branch 'tf/commit-list-prefix' into next

* tf/commit-list-prefix:
  commit: Add commit_list prefix in two function names.

Conflicts:
	sha1_name.c
---

16e1351eaa9eb73c75c27e5c308d781b2ced215f
diff --cc commit.h
index 3bfb31b5e,6452928d5..eb6c5af1f
--- a/commit.h
+++ b/commit.h
@@@ -36,10 -36,8 +36,9 @@@ struct commit *lookup_commit(const unsi
  struct commit *lookup_commit_reference(const unsigned char *sha1);
  struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
  					      int quiet);
 +struct commit *lookup_commit_reference_by_name(const char *name);
  
  int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size);
- 
  int parse_commit(struct commit *item);
  
  /* Find beginning and length of commit subject. */
diff --cc sha1_name.c
index ceb9cdd86,a96de0bda..709ff2eee
--- a/sha1_name.c
+++ b/sha1_name.c
@@@ -707,7 -683,8 +707,7 @@@ static int handle_one_ref(const char *p
  	}
  	if (object->type != OBJ_COMMIT)
  		return 0;
- 	insert_by_date((struct commit *)object, list);
+ 	commit_list_insert_by_date((struct commit *)object, list);
 -	object->flags |= ONELINE_SEEN;
  	return 0;
  }