Merge branch 'tf/commit-list-prefix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 22 Dec 2010 22:40:17 +0000 (14:40 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Dec 2010 22:40:17 +0000 (14:40 -0800)
* tf/commit-list-prefix:
  commit: Add commit_list prefix in two function names.

Conflicts:
sha1_name.c

1  2 
builtin/describe.c
commit.c
commit.h
revision.c
sha1_name.c

Simple merge
diff --cc commit.c
Simple merge
diff --cc 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 revision.c
Simple merge
diff --cc 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;
  }