summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
88a1531)
- The --start-number handling introduced breakage in the normal
code path. It started numbering at 0 when not --numbered,
for example.
- When generating one file per patch, we needlessly added an
extra blank line in front for second and subsequent files.
Signed-off-by: Junio C Hamano <junkio@cox.net>
- if (numbered && start_number < 0)
start_number = 1;
if (numbered && keep_subject < 0)
die ("-n and -k are mutually exclusive.");
start_number = 1;
if (numbered && keep_subject < 0)
die ("-n and -k are mutually exclusive.");
while (0 <= --nr) {
int shown;
commit = list[nr];
while (0 <= --nr) {
int shown;
commit = list[nr];
- rev.nr = rev.total - nr;
+ rev.nr = total - nr + (start_number - 1);
if (!use_stdout)
reopen_stdout(commit, rev.nr, keep_subject);
shown = log_tree_commit(&rev, commit);
free(commit->buffer);
commit->buffer = NULL;
if (!use_stdout)
reopen_stdout(commit, rev.nr, keep_subject);
shown = log_tree_commit(&rev, commit);
free(commit->buffer);
commit->buffer = NULL;
+
+ /* We put one extra blank line between formatted
+ * patches and this flag is used by log-tree code
+ * to see if it needs to emit a LF before showing
+ * the log; when using one file per patch, we do
+ * not want the extra blank line.
+ */
+ if (!use_stdout)
+ rev.shown_one = 0;
if (shown) {
if (rev.mime_boundary)
printf("\n--%s%s--\n\n\n",
if (shown) {
if (rev.mime_boundary)
printf("\n--%s%s--\n\n\n",