threads / patch / 25922

patchgit-cherry.txt: Change symbol marks in graph.

Subject: [PATCH] git-cherry.txt: Change symbol marks in graph.

## tl;dr

7 messages between Dec 2, 2010 and Dec 2, 2010. Diffs are folded; open one to read it.

replies: 6people: 4as markdown or json

jari.aalto@cante.net· Dec 2, 2010, 05:18 UTC · lore

From: Jari Aalto <jari.aalto@cante.net>

The common commit were marked with a minus sign (-), but that is usually interpreted as something less or substracted. Use natural equal sign (=). Commits that are not in upstream were marked with plus sign (+) but a question mark (?) is visually a litle more striking (erect) in context where all other signs are "flat". It also helps visually impared to see difference between (* ... ?) as opposed to similar signs (* ... +).

Signed-off-by: Jari Aalto <jari.aalto@cante.net>
---
 Documentation/git-cherry.txt |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

Show changes to Documentation/git-cherry.txt +5 −5

diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt
index fed115a..f342582 100644
--- a/Documentation/git-cherry.txt
+++ b/Documentation/git-cherry.txt
@@ -19,13 +19,13 @@ the 'git patch-id' program.
 Every commit that doesn't exist in the <upstream> branch
 has its id (sha1) reported, prefixed by a symbol.  The ones that have
 equivalent change already
-in the <upstream> branch are prefixed with a minus (-) sign, and those
-that only exist in the <head> branch are prefixed with a plus (+) symbol:
+in the <upstream> branch are prefixed with a equal (=) sign, and those
+that only exist in the <head> branch are prefixed with a question mark (?) symbol:
 
-               __*__*__*__*__> <upstream>
+               _*__*__*__*__> <upstream>
               /
     fork-point
-              \__+__+__-__+__+__-__+__> <head>
+              \__?__?__=__?__?__=__?__> <head>
 
 
 If a <limit> has been given then the commits along the <head> branch up
@@ -34,7 +34,7 @@ to and including <limit> are not reported:
                __*__*__*__*__> <upstream>
               /
     fork-point
-              \__*__*__<limit>__-__+__> <head>
+              \__*__*__<limit>__=__?__> <head>
 
 
 Because 'git cherry' compares the changeset rather than the commit id

-- 
1.7.2.3

Jakub Narebski· Dec 2, 2010, 08:00 UTC · re: jari.aalto@cante.net · lore

Re: [PATCH] git-cherry.txt: Change symbol marks in graph.

Jari Aalto <jari.aalto@cante.net> writes:

Show 9 quoted lines

> From: Jari Aalto <jari.aalto@cante.net>
> 
> The common commit were marked with a minus sign (-), but that is
> usually interpreted as something less or substracted. Use natural
> equal sign (=). Commits that are not in upstream were marked with plus
> sign (+) but a question mark (?) is visually a litle more striking
> (erect) in context where all other signs are "flat". It also helps
> visually impared to see difference between (* ... ?) as opposed to
> similar signs (* ... +).

Reading comprehension FAIL. The graph in question uses '+' and '-' because that is what 'git cherry' *output( uses ('+' included, '-' excluded). They are very natural in git-cherry output (diff-like).

-- 
Jakub Narebski
Poland
ShadeHawk on #git

Michael J Gruber· Dec 2, 2010, 11:05 UTC · re: Jakub Narebski · lore

Re: [PATCH] git-cherry.txt: Change symbol marks in graph.

Jakub Narebski venit, vidit, dixit 02.12.2010 09:00:

Show 15 quoted lines

> Jari Aalto <jari.aalto@cante.net> writes:
> 
>> From: Jari Aalto <jari.aalto@cante.net>
>>
>> The common commit were marked with a minus sign (-), but that is
>> usually interpreted as something less or substracted. Use natural
>> equal sign (=). Commits that are not in upstream were marked with plus
>> sign (+) but a question mark (?) is visually a litle more striking
>> (erect) in context where all other signs are "flat". It also helps
>> visually impared to see difference between (* ... ?) as opposed to
>> similar signs (* ... +).
> 
> Reading comprehension FAIL.  The graph in question uses '+' and '-' because
> that is what 'git cherry' *output( uses ('+' included, '-' excluded).  They
> are very natural in git-cherry output (diff-like).

Yep, and I so wished that git-cherry had different output that I even saw a git-cherry patch where there was none...

So, +1 from me if this comes with an actual code patch.

Michael

Junio C Hamano· Dec 2, 2010, 17:25 UTC · re: Jakub Narebski · lore

Re: [PATCH] git-cherry.txt: Change symbol marks in graph.

Jakub Narebski <jnareb@gmail.com> writes:

Show 15 quoted lines

> Jari Aalto <jari.aalto@cante.net> writes:
>
>> From: Jari Aalto <jari.aalto@cante.net>
>> 
>> The common commit were marked with a minus sign (-), but that is
>> usually interpreted as something less or substracted. Use natural
>> equal sign (=). Commits that are not in upstream were marked with plus
>> sign (+) but a question mark (?) is visually a litle more striking
>> (erect) in context where all other signs are "flat". It also helps
>> visually impared to see difference between (* ... ?) as opposed to
>> similar signs (* ... +).
>
> Reading comprehension FAIL.  The graph in question uses '+' and '-' because
> that is what 'git cherry' *output( uses ('+' included, '-' excluded).  They
> are very natural in git-cherry output (diff-like).

Well, cherry's output is not "diff like". '+' is what you need to keep, as opposed to '-' that marks a commit that needs to be dropped from your side. If it were "diff like", '+' would have been spelled with a single ' ', but then commits on the other side you do not have need be included with '+' mark. However, 'git cherry' is not trying to produce a diff between branches; it does not matter what extra stuff the other side contains.

I however do agree with your conclusion; '=' is not "natural" in the context of 'git cherry' at all. "You need to drop this" comes more natural with '-'.

And obviously, the illustration in the documentation uses the same +/- that appear in the program's output.

So any change along the line of Jari's patch would be a dis-improvement.

Michael J Gruber· Dec 2, 2010, 08:09 UTC · re: jari.aalto@cante.net · lore

Re: [PATCH] git-cherry.txt: Change symbol marks in graph.

jari.aalto@cante.net venit, vidit, dixit 02.12.2010 06:18:

> From: Jari Aalto <jari.aalto@cante.net>

You don't need this line if it coincides with the mail header's From.

Show 6 quoted lines

> The common commit were marked with a minus sign (-), but that is
> usually interpreted as something less or substracted. Use natural
> equal sign (=). Commits that are not in upstream were marked with plus
> sign (+) but a question mark (?) is visually a litle more striking
> (erect) in context where all other signs are "flat". It also helps
> visually impared to see difference between (* ... ?) as opposed to

I assume you mean "(= ... ?)" etc. Or is "*" supposed to mean "[=-+]"? "git cherry" does not output "*".

> similar signs (* ... +).

Very good. After not having used cherry in a while, I always have to look up what "+" and "-" mean. "=" and "?" are self explaining. "=" and "+" would be also, but you're making a good point for "?". Also, often those additional commits are not really additional but applied with minor path-id-changing edits.

Show 17 quoted lines

> 
> Signed-off-by: Jari Aalto <jari.aalto@cante.net>
> ---
>  Documentation/git-cherry.txt |   10 +++++-----
>  1 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt
> index fed115a..f342582 100644
> --- a/Documentation/git-cherry.txt
> +++ b/Documentation/git-cherry.txt
> @@ -19,13 +19,13 @@ the 'git patch-id' program.
>  Every commit that doesn't exist in the <upstream> branch
>  has its id (sha1) reported, prefixed by a symbol.  The ones that have
>  equivalent change already
> -in the <upstream> branch are prefixed with a minus (-) sign, and those
> -that only exist in the <head> branch are prefixed with a plus (+) symbol:
> +in the <upstream> branch are prefixed with a equal (=) sign, and those

"an equal"

Show 20 quoted lines

> +that only exist in the <head> branch are prefixed with a question mark (?) symbol:
>  
> -               __*__*__*__*__> <upstream>
> +               _*__*__*__*__> <upstream>
>                /
>      fork-point
> -              \__+__+__-__+__+__-__+__> <head>
> +              \__?__?__=__?__?__=__?__> <head>
>  
>  
>  If a <limit> has been given then the commits along the <head> branch up
> @@ -34,7 +34,7 @@ to and including <limit> are not reported:
>                 __*__*__*__*__> <upstream>
>                /
>      fork-point
> -              \__*__*__<limit>__-__+__> <head>
> +              \__*__*__<limit>__=__?__> <head>
>  
>  
>  Because 'git cherry' compares the changeset rather than the commit id

Other than the above

Acked-by: Michael J Gruber <git@drmicha.warpmail.net>

Jari Aalto· Dec 2, 2010, 12:28 UTC · re: Michael J Gruber · lore

[PATCH v2] git-cherry.txt: Change symbol marks in graph.

Signed-off-by: Jari Aalto <jari.aalto@cante.net>
---
 Documentation/git-cherry.txt |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

    Revised:

    >> +in the <upstream> branch are prefixed with a equal (=) sign, and those
    >
    > "an equal"

Show changes to Documentation/git-cherry.txt +5 −5

diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt
index fed115a..f49eded 100644
--- a/Documentation/git-cherry.txt
+++ b/Documentation/git-cherry.txt
@@ -19,13 +19,13 @@ the 'git patch-id' program.
 Every commit that doesn't exist in the <upstream> branch
 has its id (sha1) reported, prefixed by a symbol.  The ones that have
 equivalent change already
-in the <upstream> branch are prefixed with a minus (-) sign, and those
-that only exist in the <head> branch are prefixed with a plus (+) symbol:
+in the <upstream> branch are prefixed with an equal sign (=), and those
+that only exist in the <head> branch are prefixed with a question mark (?) symbol:
 
-               __*__*__*__*__> <upstream>
+               _*__*__*__*__> <upstream>
               /
     fork-point
-              \__+__+__-__+__+__-__+__> <head>
+              \__?__?__=__?__?__=__?__> <head>
 
 
 If a <limit> has been given then the commits along the <head> branch up
@@ -34,7 +34,7 @@ to and including <limit> are not reported:
                __*__*__*__*__> <upstream>
               /
     fork-point
-              \__*__*__<limit>__-__+__> <head>
+              \__*__*__<limit>__=__?__> <head>
 
 
 Because 'git cherry' compares the changeset rather than the commit id

-- 
1.7.2.3

Michael J Gruber· Dec 2, 2010, 15:26 UTC · re: Jari Aalto · lore

Re: [PATCH v2] git-cherry.txt: Change symbol marks in graph.

Jari Aalto venit, vidit, dixit 02.12.2010 13:28:

Show 50 quoted lines

> The common commit were marked with a minus sign (-), but that is
> usually interpreted as something less or substracted. Use natural
> equal sign (=). Commits that are not in upstream were marked with plus
> sign (+) but a question mark (?) is visually a litle more striking
> (erect) in context where all other signs are "flat". It also helps
> visually impared to see difference between (= ... ?).
> 
> Signed-off-by: Jari Aalto <jari.aalto@cante.net>
> ---
>  Documentation/git-cherry.txt |   10 +++++-----
>  1 files changed, 5 insertions(+), 5 deletions(-)
> 
>     Revised:
> 
>     >> +in the <upstream> branch are prefixed with a equal (=) sign, and those
>     >
>     > "an equal"
> 
> 
> diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt
> index fed115a..f49eded 100644
> --- a/Documentation/git-cherry.txt
> +++ b/Documentation/git-cherry.txt
> @@ -19,13 +19,13 @@ the 'git patch-id' program.
>  Every commit that doesn't exist in the <upstream> branch
>  has its id (sha1) reported, prefixed by a symbol.  The ones that have
>  equivalent change already
> -in the <upstream> branch are prefixed with a minus (-) sign, and those
> -that only exist in the <head> branch are prefixed with a plus (+) symbol:
> +in the <upstream> branch are prefixed with an equal sign (=), and those
> +that only exist in the <head> branch are prefixed with a question mark (?) symbol:
>  
> -               __*__*__*__*__> <upstream>
> +               _*__*__*__*__> <upstream>
>                /
>      fork-point
> -              \__+__+__-__+__+__-__+__> <head>
> +              \__?__?__=__?__?__=__?__> <head>
>  
>  
>  If a <limit> has been given then the commits along the <head> branch up
> @@ -34,7 +34,7 @@ to and including <limit> are not reported:
>                 __*__*__*__*__> <upstream>
>                /
>      fork-point
> -              \__*__*__<limit>__-__+__> <head>
> +              \__*__*__<limit>__=__?__> <head>
>  
>  
>  Because 'git cherry' compares the changeset rather than the commit id

Well, that plus the patch to git-cherry itself which I saw before without being there .|

Michael