author | Junio C Hamano <gitster@pobox.com> | |
Wed, 22 Dec 2010 22:40:17 +0000 (14:40 -0800) | ||
committer | Junio 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
commit: Add commit_list prefix in two function names.
Conflicts:
sha1_name.c
1 | 2 | |||
---|---|---|---|---|
builtin/describe.c | patch | | diff1 | | diff2 | | blob | history |
commit.c | patch | | diff1 | | diff2 | | blob | history |
commit.h | patch | | diff1 | | diff2 | | blob | history |
revision.c | patch | | diff1 | | diff2 | | blob | history |
sha1_name.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc builtin/describe.c
Simple merge
diff --cc commit.c
Simple merge
diff --cc commit.h
index 3bfb31b5e0faad6ea04fde9e2f932f54d2e6c235,6452928d556a37f6ad1b67a544400af286278113..eb6c5af1f6b18546b3b3f1683142b15bb0ae9e34
+++ b/commit.h
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
index ceb9cdd860da78bf3fe0a1819846ded0e87fda8c,a96de0bdae482087dc44b2b193c3b75f65ffda0a..709ff2eee64cf106191ad274bede82a95d00e2a3
--- 1/sha1_name.c
--- 2/sha1_name.c
+++ b/sha1_name.c
}
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;
}