freshlybakedca.ke / git
Git fork
fork atom

rev-list: inline `show_object_with_name()` in `show_object()`

The `show_object_with_name()` function only has a single call site.
Inline call to `show_object_with_name()` in `show_object()` so the
explicit function can be cleaned up and live closer to where it is used.
While at it, factor out the code that prints the OID and newline for
both objects with and without a name. In a subsequent commit,
`show_object()` is modified to support printing object information in a
NUL-delimited format.

Signed-off-by: Justin Tobler <jltobler@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

authored by

Justin Tobler and committed by
Junio C Hamano 1481e291 87a0bdbf

+9 -14
+9 -4
builtin/rev-list.c
··· 357 357 return; 358 358 } 359 359 360 - if (arg_show_object_names) 361 - show_object_with_name(stdout, obj, name); 362 - else 363 - printf("%s\n", oid_to_hex(&obj->oid)); 360 + printf("%s", oid_to_hex(&obj->oid)); 361 + 362 + if (arg_show_object_names) { 363 + putchar(' '); 364 + for (const char *p = name; *p && *p != '\n'; p++) 365 + putchar(*p); 366 + } 367 + 368 + putchar('\n'); 364 369 } 365 370 366 371 static void show_edge(struct commit *commit)
-8
revision.c
··· 59 59 60 60 static inline int want_ancestry(const struct rev_info *revs); 61 61 62 - void show_object_with_name(FILE *out, struct object *obj, const char *name) 63 - { 64 - fprintf(out, "%s ", oid_to_hex(&obj->oid)); 65 - for (const char *p = name; *p && *p != '\n'; p++) 66 - fputc(*p, out); 67 - fputc('\n', out); 68 - } 69 - 70 62 static void mark_blob_uninteresting(struct blob *blob) 71 63 { 72 64 if (!blob)
-2
revision.h
··· 489 489 void mark_tree_uninteresting(struct repository *r, struct tree *tree); 490 490 void mark_trees_uninteresting_sparse(struct repository *r, struct oidset *trees); 491 491 492 - void show_object_with_name(FILE *, struct object *, const char *); 493 - 494 492 /** 495 493 * Helpers to check if a reference should be excluded. 496 494 */