OSDN Git Service
(root)
/
git-core
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
write_entry: fix leak when retrying delayed filter
[git-core/git.git]
/
log-tree.c
diff --git
a/log-tree.c
b/log-tree.c
index
4618dd0
..
a4ec11c
100644
(file)
--- a/
log-tree.c
+++ b/
log-tree.c
@@
-105,13
+105,13
@@
static int add_ref_decoration(const char *refname, const struct object_id *oid,
warning("invalid replace ref %s", refname);
return 0;
}
warning("invalid replace ref %s", refname);
return 0;
}
- obj = parse_object(
original_oid.hash
);
+ obj = parse_object(
&original_oid
);
if (obj)
add_name_decoration(DECORATION_GRAFTED, "replaced", obj);
return 0;
}
if (obj)
add_name_decoration(DECORATION_GRAFTED, "replaced", obj);
return 0;
}
- obj = parse_object(oid
->hash
);
+ obj = parse_object(oid);
if (!obj)
return 0;
if (!obj)
return 0;
@@
-132,7
+132,7
@@
static int add_ref_decoration(const char *refname, const struct object_id *oid,
if (!obj)
break;
if (!obj->parsed)
if (!obj)
break;
if (!obj->parsed)
- parse_object(
obj->oid.hash
);
+ parse_object(
&obj->oid
);
add_name_decoration(DECORATION_REF_TAG, refname, obj);
}
return 0;
add_name_decoration(DECORATION_REF_TAG, refname, obj);
}
return 0;
@@
-140,7
+140,7
@@
static int add_ref_decoration(const char *refname, const struct object_id *oid,
static int add_graft_decoration(const struct commit_graft *graft, void *cb_data)
{
static int add_graft_decoration(const struct commit_graft *graft, void *cb_data)
{
- struct commit *commit = lookup_commit(
graft->oid.hash
);
+ struct commit *commit = lookup_commit(
&graft->oid
);
if (!commit)
return 0;
add_name_decoration(DECORATION_GRAFTED, "grafted", &commit->object);
if (!commit)
return 0;
add_name_decoration(DECORATION_GRAFTED, "grafted", &commit->object);
@@
-184,7
+184,7
@@
static const struct name_decoration *current_pointed_by_HEAD(const struct name_d
{
const struct name_decoration *list, *head = NULL;
const char *branch_name = NULL;
{
const struct name_decoration *list, *head = NULL;
const char *branch_name = NULL;
-
unsigned char unused[20]
;
+
struct object_id unused
;
int rru_flags;
/* First find HEAD */
int rru_flags;
/* First find HEAD */
@@
-197,7
+197,7
@@
static const struct name_decoration *current_pointed_by_HEAD(const struct name_d
return NULL;
/* Now resolve and find the matching current branch */
return NULL;
/* Now resolve and find the matching current branch */
- branch_name = resolve_ref_unsafe("HEAD", 0, unused, &rru_flags);
+ branch_name = resolve_ref_unsafe("HEAD", 0, unused
.hash
, &rru_flags);
if (!(rru_flags & REF_ISSYMREF))
return NULL;
if (!(rru_flags & REF_ISSYMREF))
return NULL;
@@
-456,13
+456,13
@@
static void show_signature(struct rev_info *opt, struct commit *commit)
strbuf_release(&signature);
}
strbuf_release(&signature);
}
-static int which_parent(const
unsigned char *sha1
, const struct commit *commit)
+static int which_parent(const
struct object_id *oid
, const struct commit *commit)
{
int nth;
const struct commit_list *parent;
for (nth = 0, parent = commit->parents; parent; parent = parent->next) {
{
int nth;
const struct commit_list *parent;
for (nth = 0, parent = commit->parents; parent; parent = parent->next) {
- if (!
hashcmp(parent->item->object.oid.hash, sha1
))
+ if (!
oidcmp(&parent->item->object.oid, oid
))
return nth;
nth++;
}
return nth;
nth++;
}
@@
-481,14
+481,14
@@
static void show_one_mergetag(struct commit *commit,
void *data)
{
struct rev_info *opt = (struct rev_info *)data;
void *data)
{
struct rev_info *opt = (struct rev_info *)data;
-
unsigned char sha1[20]
;
+
struct object_id oid
;
struct tag *tag;
struct strbuf verify_message;
int status, nth;
size_t payload_size, gpg_message_offset;
struct tag *tag;
struct strbuf verify_message;
int status, nth;
size_t payload_size, gpg_message_offset;
- hash_sha1_file(extra->value, extra->len, typename(OBJ_TAG),
sha1
);
- tag = lookup_tag(
sha1
);
+ hash_sha1_file(extra->value, extra->len, typename(OBJ_TAG),
oid.hash
);
+ tag = lookup_tag(
&oid
);
if (!tag)
return; /* error message already given */
if (!tag)
return; /* error message already given */
@@
-500,7
+500,7
@@
static void show_one_mergetag(struct commit *commit,
&commit->parents->next->item->object.oid))
strbuf_addf(&verify_message,
"merged tag '%s'\n", tag->tag);
&commit->parents->next->item->object.oid))
strbuf_addf(&verify_message,
"merged tag '%s'\n", tag->tag);
- else if ((nth = which_parent(
tag->tagged->oid.hash
, commit)) < 0)
+ else if ((nth = which_parent(
&tag->tagged->oid
, commit)) < 0)
strbuf_addf(&verify_message, "tag %s names a non-parent %s\n",
tag->tag, tag->tagged->oid.hash);
else
strbuf_addf(&verify_message, "tag %s names a non-parent %s\n",
tag->tag, tag->tagged->oid.hash);
else
@@
-536,7
+536,7
@@
void show_log(struct rev_info *opt)
struct strbuf msgbuf = STRBUF_INIT;
struct log_info *log = opt->loginfo;
struct commit *commit = log->commit, *parent = log->parent;
struct strbuf msgbuf = STRBUF_INIT;
struct log_info *log = opt->loginfo;
struct commit *commit = log->commit, *parent = log->parent;
- int abbrev_commit = opt->abbrev_commit ? opt->abbrev :
40
;
+ int abbrev_commit = opt->abbrev_commit ? opt->abbrev :
GIT_SHA1_HEXSZ
;
const char *extra_headers = opt->extra_headers;
struct pretty_print_context ctx = {0};
const char *extra_headers = opt->extra_headers;
struct pretty_print_context ctx = {0};