white spaces in a patch

Hello,

It occurred to me that I prepared some patch for a git tree, and then when testing git-apply on it (on the original tree) I saw some "white spaces" errors. I know that I can run: "git --whitespace=fix apply" on my patch and than create the patch again ; in this way it will be created without white spaces.

Suppose I create a patch file (let's say : patch.txt)
1) Is there a way to check whether there are white spaces in this
file without running git-apply?
2) Is there a way to get some messages about that there are white spaces
when creating a git patch?

Regards, Mark

"Mark Ryden" <markryde@gmail.com> writes:

"sed -n -e '/^+.*[ 	]$/p' patch.txt" perhaps?

Doesn't "git diff" highlight whitespace errors? That way, you can catch errors before you make a commit that has them.

Hello,

I tried:
git apply patch1.txt
patch1.txt:34: trailing whitespace.
				
patch1.txt:53: trailing whitespace.

And "git diff" show differences but **does not** highlight anything. I tried in tchs and in Bash.

Any ideas ? does "git diff" does  highlight for anyone ?

Rgs, Mark

On Wed, Dec 17, 2008 at 9:34 AM, Junio C Hamano <gitster@pobox.com> wrote:

On Wed, Dec 17, 2008 at 12:44, Mark Ryden <markryde@gmail.com> wrote:

Do you have color on?

What do you mean ? where ? how ? Mark

On Wed, Dec 17, 2008 at 2:13 PM, Sverre Rabbelier <srabbelier@gmail.com> wrote:

On Wednesday, 17. December 2008 13:13:34 Mark Ryden wrote: [colors in diff]

This should do the trick:

git config --global color.diff auto git config --global color.status auto git config --global color.branch auto

Thomas

Thnks! In fact, the first line was enough! git config --global color.diff auto Mark

On Wed, Dec 17, 2008 at 2:15 PM, Thomas Jarosch <thomas.jarosch@intra2net.com> wrote:

"Mark Ryden" <markryde@gmail.com> writes:

Yes, but you may appreciate color in other commands (log, status, ...). Then, "color.ui = auto" is your friend.

On Wed, Dec 17, 2008 at 01:15:56PM +0100, Thomas Jarosch wrote:

These days we have

  git config --global color.ui auto

-Peff

On Wed, Dec 17, 2008 at 13:13, Mark Ryden <markryde@gmail.com> wrote:

$ git config color.diff true

Hi,

On Tue, 16 Dec 2008, Junio C Hamano wrote:

Not to mention "git diff --check", which should catch them, too.

Ciao, Dscho

Hello, Thanks!

"git diff --check" indeed tells about trailing whitespace Mark

On Wed, Dec 17, 2008 at 2:08 PM, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote: