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

revision.c: add show_object_with_name() helper function

Browse Source 
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>
This commit is contained in:
Junio C Hamano
2011-08-17 14:30:34 -07:00
parent 5f25b6299d
commit 91f175165a
4 changed files with 23 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
builtin/rev-list.c
View File

@ -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) 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); finish_object(obj, path, component);
if (ep) { show_object_with_name(stdout, obj, path, component);
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);
} }
static void show_edge(struct commit *commit) static void show_edge(struct commit *commit)

19
revision.c
View File

@ -40,6 +40,25 @@ char *path_name(const struct name_path *path, const char *name)
return n; 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, void add_object(struct object *obj,
struct object_array *p, struct object_array *p,
struct name_path *path, struct name_path *path,

2
revision.h
View File

@ -185,6 +185,8 @@ struct name_path {
char *path_name(const struct name_path *path, const char *name); 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, extern void add_object(struct object *obj,
struct object_array *p, struct object_array *p,
struct name_path *path, struct name_path *path,

15
upload-pack.c
View File

@ -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) 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 show_object_with_name(pack_pipe, obj, path, component);
* 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);
} }
static void show_edge(struct commit *commit) static void show_edge(struct commit *commit)