How do I get a readable diff?

How do I get a readable diff?

[Bruce Korb]

I know I can pipe it through "cat", but I'd rather the clutter be gone.
There has to be a way.

ESC[1mdiff --git a/lustre/include/lustre_disk.h b/lustre/include/lustre_disk.hESC[m
ESC[1mindex 10f6328..564fc08 100644ESC[m
ESC[1m--- a/lustre/include/lustre_disk.hESC[m
ESC[1m+++ b/lustre/include/lustre_disk.hESC[m
ESC[36m@@ -185,6 +185,7 @@ESC[m ESC[mstruct lustre_mount_data {ESC[m
          int        lmd_exclude_count;ESC[m
          int        lmd_recovery_time_soft;ESC[m
          int        lmd_recovery_time_hard;ESC[m
ESC[32m+ESC[mESC[32m        int        lmd_reserved_inodes; /* preferred value */ESC[m
          char      *lmd_dev;           /* device name */ESC[m
          char      *lmd_profile;       /* client only */ESC[m
          char      *lmd_mgssec;        /* sptlrpc flavor to mgs */ESC[m
ESC[36m@@ -202,6 +203,8 @@ESC[m ESC[mstruct lustre_mount_data {ESC[m
                                          existing MGS services */ESC[m
  #define LMD_FLG_WRITECONF    0x0040  /* Rewrite config log */ESC[m
  ESC[m
ESC[32m+ESC[mESC[32m#define LMD_RESERVED_INODES_DEFAULT 100ESC[m
ESC[32m+ESC[m
  #define lmd_is_client(x) ((x)->lmd_flags & LMD_FLG_CLIENT)ESC[m
  ESC[m
  ESC[m

Re: How do I get a readable diff?

[Brandon Casey]

On 08/26/2011 05:42 PM, Bruce Korb wrote:
> I know I can pipe it through "cat", but I'd rather the clutter be gone.
> There has to be a way.

Your terminal does not support color.  Are you on an ancient system?
or something exotic?

You can disable it by setting the color.ui config variable in your
"user" config file ~/.gitconfig like this:

   git config --global color.ui never

-Brandon


> ESC[1mdiff --git a/lustre/include/lustre_disk.h b/lustre/include/lustre_disk.hESC[m
> ESC[1mindex 10f6328..564fc08 100644ESC[m
> ESC[1m--- a/lustre/include/lustre_disk.hESC[m
> ESC[1m+++ b/lustre/include/lustre_disk.hESC[m
> ESC[36m@@ -185,6 +185,7 @@ESC[m ESC[mstruct lustre_mount_data {ESC[m
>          int        lmd_exclude_count;ESC[m
>          int        lmd_recovery_time_soft;ESC[m
>          int        lmd_recovery_time_hard;ESC[m
> ESC[32m+ESC[mESC[32m        int        lmd_reserved_inodes; /* preferred value */ESC[m
>          char      *lmd_dev;           /* device name */ESC[m
>          char      *lmd_profile;       /* client only */ESC[m
>          char      *lmd_mgssec;        /* sptlrpc flavor to mgs */ESC[m
> ESC[36m@@ -202,6 +203,8 @@ESC[m ESC[mstruct lustre_mount_data {ESC[m
>                                          existing MGS services */ESC[m
>  #define LMD_FLG_WRITECONF    0x0040  /* Rewrite config log */ESC[m
>  ESC[m
> ESC[32m+ESC[mESC[32m#define LMD_RESERVED_INODES_DEFAULT 100ESC[m
> ESC[32m+ESC[m
>  #define lmd_is_client(x) ((x)->lmd_flags & LMD_FLG_CLIENT)ESC[m
>  ESC[m
>  ESC[m
> -- 
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: How do I get a readable diff?

[Junio C Hamano]

Brandon Casey <brandon.casey.ctr@nrlssc.navy.mil> writes:

> On 08/26/2011 05:42 PM, Bruce Korb wrote:
>> I know I can pipe it through "cat", but I'd rather the clutter be gone.
>> There has to be a way.
>
>> ESC[1mdiff --git a/lustre/include/lustre_disk.h b/lustre/include/lustre_disk.hESC[m
> ...
> Your terminal does not support color.  Are you on an ancient system?
> or something exotic?
>
> You can disable it by setting the color.ui config variable in your
> "user" config file ~/.gitconfig like this:
>
>    git config --global color.ui never
>
> -Brandon

Another possibility is that the user has a LESS environment defined, but
without "R" to let it interpret the color. When we do not see "LESS" in
the environment, we play nice and give them FRSX, but if the user already
has LESS, we assume the user knows better than us and do not touch the
environment.  Compare:

    $ LESS=N git show
    $ LESS=NR git show