threads / discuss / 17063

(unknown)

Subject: (unknown)

## tl;dr

3 messages between Jan 9, 2009 and Jan 10, 2009.

replies: 2people: 2as markdown or json

nathan.panike@gmail.com· Jan 9, 2009, 19:02 UTC · lore

>From 65c4fed27fe9752ffd0e3b7cb6807561a4dd4601 Mon Sep 17 00: 00:00 2001

From: Nathan W. Panike <nathan.panike@gmail.com>
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

Johannes Schindelin· Jan 10, 2009, 10:27 UTC · re: nathan.panike@gmail.com · lore

Re: [PATCH] Get format-patch to show first commit after root commit

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:

Show 8 quoted lines

> >From 65c4fed27fe9752ffd0e3b7cb6807561a4dd4601 Mon Sep 17 00: 00:00 2001
> From: Nathan W. Panike <nathan.panike@gmail.com>
> 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).

Show 11 quoted lines

> 
> 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

Johannes Schindelin· Jan 10, 2009, 10:35 UTC · re: Johannes Schindelin · lore

Re: [PATCH] Get format-patch to show first commit after root commit

Hi,

On Sat, 10 Jan 2009, Johannes Schindelin wrote:

Show 13 quoted lines

> On Fri, 9 Jan 2009, nathan.panike@gmail.com wrote:
> 
> > >From 65c4fed27fe9752ffd0e3b7cb6807561a4dd4601 Mon Sep 17 00: 00:00 2001
> > From: Nathan W. Panike <nathan.panike@gmail.com>
> > 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