mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'jc/traverse-commit-list'
* jc/traverse-commit-list: revision.c: update show_object_with_name() without using malloc() revision.c: add show_object_with_name() helper function rev-list: fix finish_object() call
This commit is contained in:
commit
f817f2fbb5
|
@ -176,21 +176,8 @@ static void finish_object(struct object *obj, const struct name_path *path, cons
|
|||
|
||||
static void show_object(struct object *obj, const struct name_path *path, const char *component)
|
||||
{
|
||||
char *name = path_name(path, component);
|
||||
/* An object with name "foo\n0000000..." can be used to
|
||||
* confuse downstream "git pack-objects" very badly.
|
||||
*/
|
||||
const char *ep = strchr(name, '\n');
|
||||
|
||||
finish_object(obj, path, name);
|
||||
if (ep) {
|
||||
printf("%s %.*s\n", sha1_to_hex(obj->sha1),
|
||||
(int) (ep - name),
|
||||
name);
|
||||
}
|
||||
else
|
||||
printf("%s %s\n", sha1_to_hex(obj->sha1), name);
|
||||
free(name);
|
||||
finish_object(obj, path, component);
|
||||
show_object_with_name(stdout, obj, path, component);
|
||||
}
|
||||
|
||||
static void show_edge(struct commit *commit)
|
||||
|
|
41
revision.c
41
revision.c
|
@ -40,6 +40,47 @@ char *path_name(const struct name_path *path, const char *name)
|
|||
return n;
|
||||
}
|
||||
|
||||
static int show_path_component_truncated(FILE *out, const char *name, int len)
|
||||
{
|
||||
int cnt;
|
||||
for (cnt = 0; cnt < len; cnt++) {
|
||||
int ch = name[cnt];
|
||||
if (!ch || ch == '\n')
|
||||
return -1;
|
||||
fputc(ch, out);
|
||||
}
|
||||
return len;
|
||||
}
|
||||
|
||||
static int show_path_truncated(FILE *out, const struct name_path *path)
|
||||
{
|
||||
int emitted, ours;
|
||||
|
||||
if (!path)
|
||||
return 0;
|
||||
emitted = show_path_truncated(out, path->up);
|
||||
if (emitted < 0)
|
||||
return emitted;
|
||||
if (emitted)
|
||||
fputc('/', out);
|
||||
ours = show_path_component_truncated(out, path->elem, path->elem_len);
|
||||
if (ours < 0)
|
||||
return ours;
|
||||
return ours || emitted;
|
||||
}
|
||||
|
||||
void show_object_with_name(FILE *out, struct object *obj, const struct name_path *path, const char *component)
|
||||
{
|
||||
struct name_path leaf;
|
||||
leaf.up = (struct name_path *)path;
|
||||
leaf.elem = component;
|
||||
leaf.elem_len = strlen(component);
|
||||
|
||||
fprintf(out, "%s ", sha1_to_hex(obj->sha1));
|
||||
show_path_truncated(out, &leaf);
|
||||
fputc('\n', out);
|
||||
}
|
||||
|
||||
void add_object(struct object *obj,
|
||||
struct object_array *p,
|
||||
struct name_path *path,
|
||||
|
|
|
@ -205,6 +205,8 @@ struct name_path {
|
|||
|
||||
char *path_name(const struct name_path *path, const char *name);
|
||||
|
||||
extern void show_object_with_name(FILE *, struct object *, const struct name_path *, const char *);
|
||||
|
||||
extern void add_object(struct object *obj,
|
||||
struct object_array *p,
|
||||
struct name_path *path,
|
||||
|
|
|
@ -86,20 +86,7 @@ static void show_commit(struct commit *commit, void *data)
|
|||
|
||||
static void show_object(struct object *obj, const struct name_path *path, const char *component)
|
||||
{
|
||||
/* An object with name "foo\n0000000..." can be used to
|
||||
* confuse downstream git-pack-objects very badly.
|
||||
*/
|
||||
const char *name = path_name(path, component);
|
||||
const char *ep = strchr(name, '\n');
|
||||
if (ep) {
|
||||
fprintf(pack_pipe, "%s %.*s\n", sha1_to_hex(obj->sha1),
|
||||
(int) (ep - name),
|
||||
name);
|
||||
}
|
||||
else
|
||||
fprintf(pack_pipe, "%s %s\n",
|
||||
sha1_to_hex(obj->sha1), name);
|
||||
free((char *)name);
|
||||
show_object_with_name(pack_pipe, obj, path, component);
|
||||
}
|
||||
|
||||
static void show_edge(struct commit *commit)
|
||||
|
|
Loading…
Reference in a new issue