From: Greg KH <greg@kroah.com>
To: git@vger.kernel.org
Subject: Re: diffstat wierdness with 'git format-patch' output
Date: Mon, 13 Feb 2006 21:56:48 -0800 [thread overview]
Message-ID: <20060214055648.GA592@kroah.com> (raw)
In-Reply-To: <20060214055425.GA32261@kroah.com>
On Mon, Feb 13, 2006 at 09:54:25PM -0800, Greg KH wrote:
> I was trying to use the built-in git tools to send patches off, instead
> of my horribly hacked up scripts that use the git low-level stuff, when
> I noticed that git format-patch's output confuses diffstat a bit, and
> causes it to add another line to it's count.
>
> This isn't good when I do a 'diffstat -p1 *.txt' of the output and add
> it to an email to send off for someone to pull from, as the result will
> be off from what is really there.
>
> Here's what I get:
>
> $ git format-patch -n origin..HEAD
> 0001-USB-fix-up-the-usb-early-handoff-logic-for-EHCI.txt
> 0002-USB-add-new-device-ids-to-ldusb.txt
> 0003-USB-change-ldusb-s-experimental-state.txt
> 0004-USB-PL2303-Leadtek-9531-GPS-Mouse.txt
> 0005-USB-sl811_cs-needs-platform_device-conversion-too.txt
> 0006-usb-storage-new-unusual_devs-entry.txt
> 0007-usb-storage-unusual_devs-entry.txt
> 0008-USB-unusual_devs.h-entry-TrekStor-i.Beat.txt
> 0009-USB-unusual_devs.h-entry-iAUDIO-M5.txt
> 0010-USB-unusual-devs-bugfix.txt
>
> $ git log | head -n 1
> commit 16f05be7be0bf121491d83bd97337fe179b3b323
>
> $ git show 16f05be7be0bf121491d83bd97337fe179b3b323 | diffstat -p1
> drivers/usb/storage/unusual_devs.h | 25 ++++++++++++++++++-------
> 1 file changed, 18 insertions(+), 7 deletions(-)
>
> $ diffstat -p1 0010-USB-unusual-devs-bugfix.txt
> drivers/usb/storage/unusual_devs.h | 26 ++++++++++++++++++--------
> 1 file changed, 18 insertions(+), 8 deletions(-)
>
> Any thoughts?
Hm, in looking at it closer, it's probably the last two lines of the
file, the signature that git format-patch adds to the message:
--
1.2.0
Any way to suppress these?
thanks,
greg k-h
>
> thanks,
>
> greg k-h
next prev parent reply other threads:[~2006-02-14 5:56 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-02-14 5:54 diffstat wierdness with 'git format-patch' output Greg KH
2006-02-14 5:56 ` Greg KH [this message]
2006-02-14 6:09 ` Junio C Hamano
2006-02-14 6:34 ` Greg KH
2006-02-14 6:37 ` Junio C Hamano
2006-02-14 6:44 ` Greg KH
2006-02-14 6:42 ` Greg KH
2006-02-14 6:52 ` Greg KH
2006-02-14 7:10 ` Junio C Hamano
2006-02-18 0:34 ` Greg KH
2006-02-14 22:30 ` Fredrik Kuivinen
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060214055648.GA592@kroah.com \
--to=greg@kroah.com \
--cc=git@vger.kernel.org \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.