* [PATCH] git-cherry should show "+" instead of "-" and vice versa
@ 2006-10-23 19:03 Andy Parkins
2006-10-23 19:33 ` Petr Baudis
0 siblings, 1 reply; 3+ messages in thread
From: Andy Parkins @ 2006-10-23 19:03 UTC (permalink / raw)
To: git
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(-)
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] git-cherry should show "+" instead of "-" and vice versa
2006-10-23 19:03 [PATCH] git-cherry should show "+" instead of "-" and vice versa Andy Parkins
@ 2006-10-23 19:33 ` Petr Baudis
2006-10-23 20:22 ` Andy Parkins
0 siblings, 1 reply; 3+ messages in thread
From: Petr Baudis @ 2006-10-23 19:33 UTC (permalink / raw)
To: Andy Parkins; +Cc: git
Dear diary, on Mon, Oct 23, 2006 at 09:03:08PM CEST, I got a letter
where Andy Parkins <andyparkins@gmail.com> said that...
> 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*',/((..)*)$/)
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] git-cherry should show "+" instead of "-" and vice versa
2006-10-23 19:33 ` Petr Baudis
@ 2006-10-23 20:22 ` Andy Parkins
0 siblings, 0 replies; 3+ messages in thread
From: Andy Parkins @ 2006-10-23 20:22 UTC (permalink / raw)
To: git
[-- Attachment #1: Type: text/plain, Size: 803 bytes --]
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
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2006-10-23 20:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-10-23 19:03 [PATCH] git-cherry should show "+" instead of "-" and vice versa Andy Parkins
2006-10-23 19:33 ` Petr Baudis
2006-10-23 20:22 ` Andy Parkins
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).