mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

for-each-ref: fix %(numparent) and %(parent)

Browse Source 
The string value of %(numparent) was not returned correctly.
Also %(parent) misbehaved for the root commits (returned garbage)
and merge commits (returned first parent, followed by a space).

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2007-10-02 15:09:41 -07:00
parent c8f203255b
commit 9e1a2acfb2
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
builtin-for-each-ref.c
View File

@ -43,7 +43,7 @@ static struct {
{ "objectsize", FIELD_ULONG }, { "objectsize", FIELD_ULONG },
{ "objectname" }, { "objectname" },
{ "tree" }, { "tree" },
{ "parent" }, /* NEEDSWORK: how to address 2nd and later parents? */ { "parent" },
{ "numparent", FIELD_ULONG }, { "numparent", FIELD_ULONG },
{ "object" }, { "object" },
{ "type" }, { "type" },
@ -262,24 +262,26 @@ static void grab_commit_values(struct atom_value *val, int deref, struct object
} }
if (!strcmp(name, "numparent")) { if (!strcmp(name, "numparent")) {
char *s = xmalloc(40); char *s = xmalloc(40);
v->ul = num_parents(commit);
sprintf(s, "%lu", v->ul); sprintf(s, "%lu", v->ul);
v->s = s; v->s = s;
v->ul = num_parents(commit);
} }
else if (!strcmp(name, "parent")) { else if (!strcmp(name, "parent")) {
int num = num_parents(commit); int num = num_parents(commit);
int i; int i;
struct commit_list *parents; struct commit_list *parents;
char *s = xmalloc(42 * num); char *s = xmalloc(41 * num + 1);
v->s = s; v->s = s;
for (i = 0, parents = commit->parents; for (i = 0, parents = commit->parents;
parents; parents;
parents = parents->next, i = i + 42) { parents = parents->next, i = i + 41) {
struct commit *parent = parents->item; struct commit *parent = parents->item;
strcpy(s+i, sha1_to_hex(parent->object.sha1)); strcpy(s+i, sha1_to_hex(parent->object.sha1));
if (parents->next) if (parents->next)
s[i+40] = ' '; s[i+40] = ' ';
} }
if (!i)
*s = '\0';
} }
} }
} }