From: Alexander Potashev <aspotashev@gmail.com>
To: "Nathan W. Panike" <nathan.panike@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Get format-patch to show first commit after root commit
Date: Fri, 9 Jan 2009 23:29:40 +0300 [thread overview]
Message-ID: <20090109202940.GA17501@myhost> (raw)
In-Reply-To: <1231529725-19767-1-git-send-email-nathan.panike@gmail.com>
Hello!
I experienced this problem today while preparing a simple patch for
reply in "[PATCH 2/2] Use is_pseudo_dir_name everywhere" thread.
I used a workaround: add a file, commit, remove it, commit, add it once
again, commit and after all format-patch.
On 13:35 Fri 09 Jan , Nathan W. Panike wrote:
> 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
Your patch doesn't solve the problem if there are more than one commit
(say, 2 commits) and you run 'git format-patch -2'. Even with your patch
format-patch writes an empty patch file corresponding to the root commit
(actually, it creates 2 patches, but the first is empty).
Please, correct me if I'm wrong.
>
> 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
next prev parent reply other threads:[~2009-01-09 20:31 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-09 19:35 [PATCH] Get format-patch to show first commit after root commit Nathan W. Panike
2009-01-09 20:29 ` Alexander Potashev [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-01-09 21:33 Nathan W. Panike
2009-01-10 0:49 ` Junio C Hamano
2009-01-10 1:37 ` Nathan W. Panike
2009-01-10 11:36 ` Alexander Potashev
2009-01-09 19:02 (unknown) nathan.panike
2009-01-10 10:27 ` [PATCH] Get format-patch to show first commit after root commit Johannes Schindelin
2009-01-10 10:35 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090109202940.GA17501@myhost \
--to=aspotashev@gmail.com \
--cc=git@vger.kernel.org \
--cc=nathan.panike@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).