white spaces in a patch

white spaces in a patch

[Mark Ryden]

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

Re: white spaces in a patch

[Junio C Hamano]

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

> 1) Is there a way to check whether there are white spaces in this
> file without running git-apply?

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

> 2) Is there a way to get some messages about that there are white spaces
> when creating a git patch?

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

Re: white spaces in a patch

[Mark Ryden]

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:
> "Mark Ryden" <markryde@gmail.com> writes:
>
>> 1) Is there a way to check whether there are white spaces in this
>> file without running git-apply?
>
> "sed -n -e '/^+.*[      ]$/p' patch.txt" perhaps?
>
>> 2) Is there a way to get some messages about that there are white spaces
>> when creating a git patch?
>
> Doesn't "git diff" highlight whitespace errors?  That way, you can catch
> errors  before you make a commit that has them.
>

Re: white spaces in a patch

[Sverre Rabbelier]

On Wed, Dec 17, 2008 at 12:44, Mark Ryden <markryde@gmail.com> wrote:
> Any ideas ? does "git diff" does  highlight for anyone ?

Do you have color on?

-- 
Cheers,

Sverre Rabbelier

Re: white spaces in a patch

[Mark Ryden]

What do you mean ?
where ? how ?
Mark

On Wed, Dec 17, 2008 at 2:13 PM, Sverre Rabbelier <srabbelier@gmail.com> wrote:
> On Wed, Dec 17, 2008 at 12:44, Mark Ryden <markryde@gmail.com> wrote:
>> Any ideas ? does "git diff" does  highlight for anyone ?
>
> Do you have color on?
>
> --
> Cheers,
>
> Sverre Rabbelier
>

Re: white spaces in a patch

[Thomas Jarosch]

On Wednesday, 17. December 2008 13:13:34 Mark Ryden wrote:
[colors in diff]
> What do you mean ?
> where ? how ?

This should do the trick:

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

Thomas

Re: white spaces in a patch

[Mark Ryden]

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:
> On Wednesday, 17. December 2008 13:13:34 Mark Ryden wrote:
> [colors in diff]
>> What do you mean ?
>> where ? how ?
>
> This should do the trick:
>
> git config --global color.diff auto
> git config --global color.status auto
> git config --global color.branch auto
>
> Thomas
>
>

Re: white spaces in a patch

[Matthieu Moy]

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

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

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

-- 
Matthieu

Re: white spaces in a patch

[Jeff King]

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

> This should do the trick:
> 
> git config --global color.diff auto
> git config --global color.status auto
> git config --global color.branch auto

These days we have

  git config --global color.ui auto

-Peff

Re: white spaces in a patch

[Sverre Rabbelier]

On Wed, Dec 17, 2008 at 13:13, Mark Ryden <markryde@gmail.com> wrote:
> On Wed, Dec 17, 2008 at 2:13 PM, Sverre Rabbelier <srabbelier@gmail.com> wrote:
>> Do you have color on?

$ git config color.diff true


-- 
Cheers,

Sverre Rabbelier

Re: white spaces in a patch

[Johannes Schindelin]

Hi,

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

> "Mark Ryden" <markryde@gmail.com> writes:
> 
> > 2) Is there a way to get some messages about that there are white 
> >    spaces when creating a git patch?
> 
> Doesn't "git diff" highlight whitespace errors?  That way, you can catch 
> errors before you make a commit that has them.

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

Ciao,
Dscho

Re: white spaces in a patch

[Mark Ryden]

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:
> Hi,
>
> On Tue, 16 Dec 2008, Junio C Hamano wrote:
>
>> "Mark Ryden" <markryde@gmail.com> writes:
>>
>> > 2) Is there a way to get some messages about that there are white
>> >    spaces when creating a git patch?
>>
>> Doesn't "git diff" highlight whitespace errors?  That way, you can catch
>> errors before you make a commit that has them.
>
> Not to mention "git diff --check", which should catch them, too.
>
> Ciao,
> Dscho
>
>