From 65c4fed27fe9752ffd0e3b7cb6807561a4dd4601 Mon Sep 17 00: 00:00 2001
From: Nathan W. Panike <redacted>
Date: Fri, 9 Jan 2009 11:53:43 -0600
Subject: [PATCH] Get format-patch to show first commit after root commit
Currently, the command
git format-patch -1 e83c5163316f89bfbde
in the git repository creates an empty file. Instead, one is
forced to do
git format-patch -1 --root e83c5163316f89bfbde
This seems arbitrary. This patch fixes this case, so that
git format-patch -1 e83c5163316f89bfbde
will produce an actual patch.
---
builtin-log.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/builtin-log.c b/builtin-log.c
index 4a02ee9..5e7b61f 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -977,6 +977,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
list[nr - 1] = commit;
}
total = nr;
+ if (total == 1 && !list[0]->parents)
+ rev.show_root_diff=1;
if (!keep_subject && auto_number && total > 1)
numbered = 1;
if (numbered)
--
1.6.1.76.gc123b.dirty
Hi,
your mailing process has a problem; neither the recipients nor the subject
made it into the mail header.
On Fri, 9 Jan 2009, nathan.panike@gmail.com wrote:
quoted
From 65c4fed27fe9752ffd0e3b7cb6807561a4dd4601 Mon Sep 17 00: 00:00 2001
From: Nathan W. Panike <redacted>
Date: Fri, 9 Jan 2009 11:53:43 -0600
Subject: [PATCH] Get format-patch to show first commit after root commit
Currently, the command
git format-patch -1 e83c5163316f89bfbde
You do not need -1, and using 19 digits seems a bit arbitrary; the
convention seems to be 7 digits (that is what --abbrev-commit does).
in the git repository creates an empty file. Instead, one is
forced to do
git format-patch -1 --root e83c5163316f89bfbde
This seems arbitrary. This patch fixes this case, so that
git format-patch -1 e83c5163316f89bfbde
will produce an actual patch.
IMHO mentioning --root is misleading, as the real bug is the empty diff.
Apart from that, I like the patch, though.
Thanks,
Dscho
Hi,
On Sat, 10 Jan 2009, Johannes Schindelin wrote:
On Fri, 9 Jan 2009, nathan.panike@gmail.com wrote:
quoted
quoted
From 65c4fed27fe9752ffd0e3b7cb6807561a4dd4601 Mon Sep 17 00: 00:00 2001
From: Nathan W. Panike <redacted>
Date: Fri, 9 Jan 2009 11:53:43 -0600
Subject: [PATCH] Get format-patch to show first commit after root commit
Currently, the command
git format-patch -1 e83c5163316f89bfbde
You do not need -1, and using 19 digits seems a bit arbitrary; the
convention seems to be 7 digits (that is what --abbrev-commit does).
Sorry, the -1 is needed.
Ciao,
Dscho