Skip to content

Commit

Permalink
revision.c: add show_object_with_name() helper function
Browse files Browse the repository at this point in the history
There are two copies of traverse_commit_list callback that show the object
name followed by pathname the object was found, to produce output similar
to "rev-list --objects".

Unify them.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Junio C Hamano committed Aug 22, 2011
1 parent 5f25b62 commit 91f1751
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 28 deletions.
15 changes: 1 addition & 14 deletions builtin/rev-list.c
Original file line number Diff line number Diff line change
Expand Up @@ -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, component);
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);
show_object_with_name(stdout, obj, path, component);
}

static void show_edge(struct commit *commit)
Expand Down
19 changes: 19 additions & 0 deletions revision.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,25 @@ char *path_name(const struct name_path *path, const char *name)
return n;
}

void show_object_with_name(FILE *out, struct object *obj, const struct name_path *path, const char *component)
{
char *name = path_name(path, component);
const char *ep = strchr(name, '\n');

/*
* An object with name "foo\n0000000..." can be used to
* confuse downstream "git pack-objects" very badly.
*/
if (ep) {
fprintf(out, "%s %.*s\n", sha1_to_hex(obj->sha1),
(int) (ep - name),
name);
}
else
fprintf(out, "%s %s\n", sha1_to_hex(obj->sha1), name);
free(name);
}

void add_object(struct object *obj,
struct object_array *p,
struct name_path *path,
Expand Down
2 changes: 2 additions & 0 deletions revision.h
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,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,
Expand Down
15 changes: 1 addition & 14 deletions upload-pack.c
Original file line number Diff line number Diff line change
Expand Up @@ -85,20 +85,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)
Expand Down

0 comments on commit 91f1751

Please sign in to comment.