threads / patch / 6015

patchgit-cherry should show "+" instead of "-" and vice versa

Subject: [PATCH] git-cherry should show "+" instead of "-" and vice versa

## tl;dr

3 messages between Oct 23, 2006 and Oct 23, 2006. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Andy Parkins· Oct 23, 2006, 19:03 UTC · lore

In git-cherry.sh:

  if test -f "$patch/$2"
  then
    sign=-
  else
    sign=+
  fi

Documentation says 'If the change seems to be in the upstream, it is shown on
the standard output with prefix "+"', however the above does the reverse.  
When
the file $patch/$2 exists it is because the patch /is/ in upstream so the sign
should be "+".
Signed-off-by: Andy Parkins <andyparkins@gmail.com>
---
 git-cherry.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Show changes to git-cherry.sh +2 −2

diff --git a/git-cherry.sh b/git-cherry.sh
index 8832573..1cc48e8 100755
--- a/git-cherry.sh
+++ b/git-cherry.sh
@@ -71,9 +71,9 @@ do
 	then
 		if test -f "$patch/$2"
 		then
-			sign=-
-		else
 			sign=+
+		else
+			sign=-
 		fi
 		case "$verbose" in
 		t)

-- 
1.4.2.3

Petr Baudis· Oct 23, 2006, 19:33 UTC · re: Andy Parkins · lore

Re: [PATCH] git-cherry should show "+" instead of "-" and vice versa

Dear diary, on Mon, Oct 23, 2006 at 09:03:08PM CEST, I got a letter where Andy Parkins <andyparkins@gmail.com> said that...

Show 15 quoted lines

> In git-cherry.sh:
> 
>   if test -f "$patch/$2"
>   then
>     sign=-
>   else
>     sign=+
>   fi
> 
> Documentation says 'If the change seems to be in the upstream, it is shown on
> the standard output with prefix "+"', however the above does the reverse.  
> When
> the file $patch/$2 exists it is because the patch /is/ in upstream so the sign
> should be "+".
> Signed-off-by: Andy Parkins <andyparkins@gmail.com>

See also

	http://news.gmane.org/find-root.php?message_id=<Pine.LNX.4.58.0608071328200.22971@kivilampi-30.cs.helsinki.fi>

Did the documentation ever get fixed or noone cared enough? ;-)

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
#!/bin/perl -sp0777i<X+d*lMLa^*lN%0]dsXx++lMlN/dsM0<j]dsj
$/=unpack('H*',$_);$_=`echo 16dio\U$k"SK$/SM$n\EsN0p[lN*1
lK[d2%Sa2/d0$^Ixp"|dc`;s/\W//g;$_=pack('H*',/((..)*)$/)

Andy Parkins· Oct 23, 2006, 20:22 UTC · re: Petr Baudis · lore

Re: [PATCH] git-cherry should show "+" instead of "-" and vice versa

On Monday 2006, October 23 20:33, Petr Baudis wrote:

> Did the documentation ever get fixed or noone cared enough? ;-)

My patch makes git-cherry match the documentation.

Personally I think that the documentation is correct. git-cherry is, to me, terribly useful. I've got a few patches in my own branch and it's very useful to be able to check to see if those emailed patches have been accepted upstream with a simple

git-cherry -v upstream

Which makes it natural to see
 "-" = patch not in upstream
 "+" = patch in upstream

I read the thread you pointed at, and didn't really understand what the downer on git-cherry was, or why the patch wasn't accepted. Have I misunderstood something?

Andy

-- 
Dr Andrew Parkins, M Eng (Hons), AMIEE
andyparkins@gmail.com