diff --git a/log-tree.c b/log-tree.c
index d8ca36bbdd92f77e7d955c86bb11823a21501fa6..ac8619404797633436258dbf9d76f9f4aa323395 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
return at;
}
return at;
}
+static unsigned int digits_in_number(unsigned int number)
+{
+ unsigned int i = 10, result = 1;
+ while (i <= number) {
+ i *= 10;
+ result++;
+ }
+ return result;
+}
+
void show_log(struct rev_info *opt, const char *sep)
{
static char this_header[16384];
void show_log(struct rev_info *opt, const char *sep)
{
static char this_header[16384];
if (*sep != '\n' && opt->commit_format == CMIT_FMT_ONELINE)
extra = "\n";
if (opt->shown_one && opt->commit_format != CMIT_FMT_ONELINE)
if (*sep != '\n' && opt->commit_format == CMIT_FMT_ONELINE)
extra = "\n";
if (opt->shown_one && opt->commit_format != CMIT_FMT_ONELINE)
- putchar('\n');
+ putchar(opt->diffopt.line_termination);
opt->shown_one = 1;
/*
opt->shown_one = 1;
/*
if (opt->total > 0) {
static char buffer[64];
snprintf(buffer, sizeof(buffer),
if (opt->total > 0) {
static char buffer[64];
snprintf(buffer, sizeof(buffer),
- "Subject: [PATCH %d/%d] ",
+ "Subject: [PATCH %0*d/%d] ",
+ digits_in_number(opt->total),
opt->nr, opt->total);
subject = buffer;
} else if (opt->total == 0)
opt->nr, opt->total);
subject = buffer;
} else if (opt->total == 0)
putchar(opt->commit_format == CMIT_FMT_ONELINE ? ' ' : '\n');
if (opt->reflog_info) {
show_reflog_message(opt->reflog_info,
putchar(opt->commit_format == CMIT_FMT_ONELINE ? ' ' : '\n');
if (opt->reflog_info) {
show_reflog_message(opt->reflog_info,
- opt->commit_format == CMIT_FMT_ONELINE);;
+ opt->commit_format == CMIT_FMT_ONELINE,
+ opt->relative_date);
if (opt->commit_format == CMIT_FMT_ONELINE) {
printf("%s", sep);
return;
if (opt->commit_format == CMIT_FMT_ONELINE) {
printf("%s", sep);
return;
opt->commit_format != CMIT_FMT_ONELINE) {
int pch = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH;
if ((pch & opt->diffopt.output_format) == pch)
opt->commit_format != CMIT_FMT_ONELINE) {
int pch = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH;
if ((pch & opt->diffopt.output_format) == pch)
- printf("---%c", opt->diffopt.line_termination);
- else
- putchar(opt->diffopt.line_termination);
+ printf("---");
+ putchar('\n');
}
}
diff_flush(&opt->diffopt);
}
}
diff_flush(&opt->diffopt);