Adam Simpkins <adam@xxxxxxxxxxxxxxxx> writes:
> diff --git a/builtin-rev-list.c b/builtin-rev-list.c
> index 476a870..f868290 100644
> --- a/builtin-rev-list.c
> +++ b/builtin-rev-list.c
> ...
> @@ -52,12 +53,13 @@ static struct rev_info revs;
>
> static int bisect_list;
> static int show_timestamp;
> -static int hdr_termination;
> static const char *header_prefix;
>
> static void finish_commit(struct commit *commit);
> static void show_commit(struct commit *commit)
> {
> + graph_show_commit(revs.graph);
> +
> if (show_timestamp)
> printf("%lu ", commit->date);
> if (header_prefix)
> @@ -96,9 +98,50 @@ static void show_commit(struct commit *commit)
> pretty_print_commit(revs.commit_format, commit,
> &buf, revs.abbrev, NULL, NULL,
> revs.date_mode, 0);
> - if (buf.len)
> - printf("%s%c", buf.buf, hdr_termination);
> + if (revs.graph) {
> ...
> + } else {
> + if (buf.len) {
> + fwrite(buf.buf, sizeof(char), buf.len, stdout);
> + putchar('\n');
Now hdr_termination can never be NUL, iow you broke "rev-list -v -z"?
I'll squash in a minimum fix, because otherwise this breaks existing
tests.
--
builtin-rev-list.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/builtin-rev-list.c b/builtin-rev-list.c
index f868290..54d55cc 100644
--- a/builtin-rev-list.c
+++ b/builtin-rev-list.c
@@ -53,6 +53,7 @@ static struct rev_info revs;
static int bisect_list;
static int show_timestamp;
+static int hdr_termination;
static const char *header_prefix;
static void finish_commit(struct commit *commit);
@@ -133,10 +134,8 @@ static void show_commit(struct commit *commit)
putchar('\n');
}
} else {
- if (buf.len) {
- fwrite(buf.buf, sizeof(char), buf.len, stdout);
- putchar('\n');
- }
+ if (buf.len)
+ printf("%s%c", buf.buf, hdr_termination);
}
strbuf_release(&buf);
} else {
@@ -635,6 +634,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
}
if (revs.commit_format != CMIT_FMT_UNSPECIFIED) {
/* The command line has a --pretty */
+ hdr_termination = '\n';
if (revs.commit_format == CMIT_FMT_ONELINE)
header_prefix = "";
else
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
