* Re: [PATCH] diff-tree: stop on broken output pipe
From: Andreas Ericsson @ 2006-01-02 1:21 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: git
In-Reply-To: <Pine.LNX.4.63.0601020116020.11331@wbgn013.biozentrum.uni-wuerzburg.de>
Johannes Schindelin wrote:
> ---
>
> Without this, on my iBook git-whatchanged keeps running when I
> quit "less". I have to interrupt the process a second time. No
> idea why it works on Linux.
>
On Linux the sending end dies when it catches SIGPIPE. I would have
thought that should happen on OSX too. What shell are you running?
--
Andreas Ericsson andreas.ericsson@op5.se
OP5 AB www.op5.se
Tel: +46 8-230225 Fax: +46 8-230231
^ permalink raw reply
* Re: [PATCH] debian/ directory
From: Gerrit Pape @ 2006-01-02 10:31 UTC (permalink / raw)
To: git
In-Reply-To: <87oe31urge.kvalo.fsf@purkki.valo.iki.fi>
On Wed, Dec 28, 2005 at 06:17:05PM +0200, Kalle Valo wrote:
> Gerrit Pape <pape@smarden.org> writes:
> > Below is the diff for reference, I think though it might be better if
> > you don't include the debian/ directory in the upstream package at all.
>
> One upside in Junio's debian packages is that they[1] work also in
> sarge[2]. If he stops building them, we sarge users will miss them.
> Any volunteers to maintain them, for example, through backports.org?
Thanks to Norbert Tretkowski, the git* and cogito packages are now
available for Debian sarge through http://backports.org/.
Regards, Gerrit.
^ permalink raw reply
* Re: [PATCH] diff-tree: stop on broken output pipe
From: Johannes Schindelin @ 2006-01-02 11:01 UTC (permalink / raw)
To: Andreas Ericsson; +Cc: git
In-Reply-To: <43B88013.3020904@op5.se>
Hi,
On Mon, 2 Jan 2006, Andreas Ericsson wrote:
> Johannes Schindelin wrote:
> > ---
> >
> > Without this, on my iBook git-whatchanged keeps running when I quit
> > "less". I have to interrupt the process a second time. No
> > idea why it works on Linux.
> >
>
> On Linux the sending end dies when it catches SIGPIPE. I would have thought
> that should happen on OSX too. What shell are you running?
Why, bash 2.05a0(1)-release (powerpc-app,e-darwin6.0). Is there a way to
turn off SIGPIPEs? Could be turned off by mistake here...
Ciao,
Dscho
^ permalink raw reply
* cogito: commit message from stdin and -m switch
From: Gerrit Pape @ 2006-01-02 12:13 UTC (permalink / raw)
To: git
Hi, cg-commit(1) states
-m MESSAGE
Specify the commit message, which is used instead of starting up
an editor (if the input is not stdin, the input is appended
after all the -m messages). Multiple -m parameters are appended
to a single commit message, each as separate paragraph.
What happens is that the message on stdin overrides the message given
through the -m switch:
$ cg-init -m initial
defaulting to local storage area
Committing initial tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
Committed as 4db6889339c6d6775b18673f12bc91adf86f1c2c.
$ touch foo
$ cg-add foo
Adding file foo
$ echo 'message1' |cg-commit -m 'message0'
A foo
Committed as 99d2bbca8ac65fa0c0af7c7536228f4b9470e70f.
$ cg-log |head
commit 99d2bbca8ac65fa0c0af7c7536228f4b9470e70f
tree 4d5fcadc293a348e88f777dc0920f11e7d71441c
parent 4db6889339c6d6775b18673f12bc91adf86f1c2c
author Gerrit Pape <pape@smarden.org> Mon, 02 Jan 2006 12:07:59 +0000
committer Gerrit Pape <pape@smarden.org> Mon, 02 Jan 2006 12:07:59 +0000
message1
commit 4db6889339c6d6775b18673f12bc91adf86f1c2c
tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
$
This also breaks the selftests with stdin not connected to a terminal
(so in Debian package autobuilder environment):
$ make
Generating cg-version...
$ make test </dev/null
make -C t/ all
make[1]: Entering directory
`/usr/local/src/Debian/Upstream/GIT/cogito/t'
*** t9000-init.sh ***
* ok 1: initialize w/o the initial commit
[...]
* FAIL 16: check if the commit is proper
[ "$(git-cat-file commit HEAD | sed -n '/^parent/q; /^$/{n; :a p; n; b a}')" = "silly commit message
continued" ]
* ok 17: blow away the repository
[...]
$
Regards, Gerrit.
^ permalink raw reply
* cogito: cannot add dangling symlinks whereas git can
From: Gerrit Pape @ 2006-01-02 12:15 UTC (permalink / raw)
To: git, 313596, 313596-submitter
forwarded 313596 upstream
quit
Hi, cg-add refuses to add special files such as dangling symlinks while
git can handle them just fine. Please see http://bugs.debian.org/313596
I'm not sure why cg-add checks files to commit with test -f.
Regards, Gerrit.
---
diff --git a/cg-add b/cg-add
index 33cdc7f..382f8d5 100755
--- a/cg-add
+++ b/cg-add
@@ -61,9 +61,6 @@ for file in "${ARGS[@]}"; do
echo "$file is a directory (use cg-add -r?)" >&2
error=1
fi
- elif [ ! -f "$absfile" ]; then
- echo "$file does not exist or is not a regular file" >&2
- error=1
else
echo "$file" >>"$TMPFILE"
fi
^ permalink raw reply related
* [OT] Shameless troll ;o)
From: walt @ 2006-01-03 1:22 UTC (permalink / raw)
To: git
Forbes magazine just published an interview with OpenBSD's
leader, Theo-The-Rat, who managed to insult almost everyone
in the open-source community -- including our own Linus, of
course.
The article quoted Linus as saying that Theo 'is difficult'.
Speaking as one who has personally been insulted by Theo for
stating something which was demonstrably a fact -- I can only
agree with Linus's assessment. (I stopped posting bug-reports
to OpenBSD's mailing lists after that incident.)
So -- can I tempt Linus into explaining why he thinks Theo is
'difficult'? (I admit that my wife has given me a taste for
soap opera and idle gossip. You can blame her for this post ;O)
Happy New Year to all.
^ permalink raw reply
* Re: [OT] Shameless troll ;o)
From: Linus Torvalds @ 2006-01-03 1:39 UTC (permalink / raw)
To: walt; +Cc: git
In-Reply-To: <dpcjk7$9tp$1@sea.gmane.org>
On Mon, 2 Jan 2006, walt wrote:
>
> So -- can I tempt Linus into explaining why he thinks Theo is
> 'difficult'? (I admit that my wife has given me a taste for
> soap opera and idle gossip. You can blame her for this post ;O)
Actually, every time I've met Theo in person (which isn't all that often,
mainly at Usenix), he's been quite nice.
I just suspect that he's even more opinionated than I am (yes, it's
possible), and thinks that everybody who disagrees with him is wrong by
definition.
Now, admittedly I do that too, so maybe the difference isn't that big
after all (and if somebody calls me "difficult", I'd think he's trying to
be polite too ;).
I think I'm more likely to have areas that I don't care about, and will
say "whatever" to than Theo. That may be the _real_ difficulty with him:
anything he doesn't care for, he says "no" to.
Linus
^ permalink raw reply
* Re: [OT] Shameless troll ;o)
From: Randal L. Schwartz @ 2006-01-03 4:31 UTC (permalink / raw)
To: walt; +Cc: git
In-Reply-To: <dpcjk7$9tp$1@sea.gmane.org>
>>>>> "walt" == walt <wa1ter@myrealbox.com> writes:
walt> The article quoted Linus as saying that Theo 'is difficult'.
I had my first run-in with Theo just a month back, in which I was told
"You are clearly not skilled enough to even compile code". I blogged
about it at <http://use.perl.org/~merlyn/journal/28032>, including
links to the entire mail exchange archive.
I now consider myself a "made man" on OpenBSD. :)
--
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>
Perl/Unix/security consulting, Technical writing, Comedy, etc. etc.
See PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!
^ permalink raw reply
* [PATCH] git potty: grok 'help' to mean '--help'.
From: Andreas Ericsson @ 2006-01-03 9:53 UTC (permalink / raw)
To: git
Most other scm's understand it, most users expect it and it's an easy fix.
Signed-off-by: Andreas Ericsson <ae@op5.se>
---
git.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
bd2573445899c427adac66f2b0fe4643461ab280
diff --git a/git.c b/git.c
index e795ddb..5e7da74 100644
--- a/git.c
+++ b/git.c
@@ -244,6 +244,11 @@ int main(int argc, char **argv, char **e
for (i = 1; i < argc; i++) {
char *arg = argv[i];
+ if (!strcmp(arg, "help")) {
+ show_help = 1;
+ continue;
+ }
+
if (strncmp(arg, "--", 2))
break;
--
1.0.6-g58e3
^ permalink raw reply related
* [PATCH] qgit: increase the space between the lanes.
From: Martin Atukunda @ 2006-01-03 11:15 UTC (permalink / raw)
To: git
There are probably better ways of doing this.
Signed-off-by: Martin Atukunda <matlads@dsmagic.com>
---
src/mainimpl.cpp | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
28ddfe1297a5e1e212fc35c3419cf8364415847e
diff --git a/src/mainimpl.cpp b/src/mainimpl.cpp
index d7c4e39..1b1f0f0 100644
--- a/src/mainimpl.cpp
+++ b/src/mainimpl.cpp
@@ -1409,7 +1409,7 @@ void MainImpl::setupPixmaps() {
// little hack to read items height
new QListViewItem(listViewLog);
ph = listViewLog->firstChild()->height();
- pw = ph / 2;
+ pw = ph / 2 + 4;
listViewLog->clear(); // remove and deletes items
QPixmap cm(pw, ph);
cm.fill();
@@ -1443,17 +1443,17 @@ void MainImpl::setupPixmaps() {
case MERGE_FORK:
p.drawLine(P_90, P_270);
p.drawLine(P_180, P_0);
- p.drawRect(pw/4, ph/4, pw/2, ph/2);
+ p.drawRect(pw/4+1, ph/4, pw/2, ph/2);
break;
case MERGE_FORK_R:
p.drawLine(P_90, P_270);
p.drawLine(P_180, P_OR);
- p.drawRect(pw/4, ph/4, pw/2, ph/2);
+ p.drawRect(pw/4+1, ph/4, pw/2, ph/2);
break;
case MERGE_FORK_L:
p.drawLine(P_90, P_270);
p.drawLine(P_OR, P_0);
- p.drawRect(pw/4, ph/4, pw/2, ph/2);
+ p.drawRect(pw/4+1, ph/4, pw/2, ph/2);
break;
case JOIN:
p.drawLine(P_90, P_270);
--
1.0.GIT
^ permalink raw reply related
* Howto send many commits as mail-patches?
From: Sam Ravnborg @ 2006-01-03 11:38 UTC (permalink / raw)
To: git
Hi all.
I have a collection of commits in my GIT repository that I like to send
out to linux-kernel.
But my initial experiments with git-send-emails.perl fall out bad.
I did the following:
1) First I created a mbox with the patches:
git format-patch -n --mbox --stdout -M -B b286e39207237e2f6929959372bf66d9a8d05a82 > mbox
The mbox looked OK. -M -B were from the man page and since the patchset
includes a number of renames it made the mbox considerably smaller.
So I went on an tried to send the mails:
git-send-email.perl --from "Sam Ravnborg <sam@ravnborg.org>" --to "sam@ravnborg.org" --chain-reply-to "" mbox
It just send out two huge mails containing all of the mbox.
Also it cc:ed all people included in "Signed-off-by". That is sometimes
a nice feature but for testing I like it to be optional.
Can someone give me a nice howto so I can see how to send out the mails.
TIA,
Sam
^ permalink raw reply
* [PATCH] Fix git-symbolic-ref typo in git.txt.
From: Jon Loeliger @ 2006-01-03 14:38 UTC (permalink / raw)
To: git
---
Documentation/git.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
e2d03bbe141efb2f630214e6e5123e4addf5475d
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 90c5bfa..92cfe0e 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -425,7 +425,7 @@ gitlink:git-rev-parse[1]::
gitlink:git-send-email[1]::
Send patch e-mails out of "format-patch --mbox" output.
-gitlink:git-symbolic-refs[1]::
+gitlink:git-symbolic-ref[1]::
Read and modify symbolic refs.
gitlink:git-stripspace[1]::
--
^ permalink raw reply related
* Re: [OT] Shameless troll ;o)
From: Theodore Ts'o @ 2006-01-03 14:56 UTC (permalink / raw)
To: walt; +Cc: git
In-Reply-To: <dpcjk7$9tp$1@sea.gmane.org>
On Mon, Jan 02, 2006 at 05:22:18PM -0800, walt wrote:
> Forbes magazine just published an interview with OpenBSD's
> leader, Theo-The-Rat, who managed to insult almost everyone
> in the open-source community -- including our own Linus, of
> course.
If by "Just Published" you mean over six months ago, maybe.
Basically, the troll is Daniel Lyons, a Forbes writer who at every
opportunity tries to trash Linux. Just ignore him; or better yet,
cancel your Forbes subscription, and a send a note to the Forbes
publishers saying why. I've completely lost any respect I've had for
the Forbes magazine, partially as a result of the multiple dreck
masquerading as articles published by Dan Lyons. Speaking personally,
I believe there are much better places for me to get my business news,
including Business Week and the Economist.
- Ted
^ permalink raw reply
* Re: [OT] Shameless troll ;o)
From: Johannes Schindelin @ 2006-01-03 15:10 UTC (permalink / raw)
To: Theodore Ts'o; +Cc: git
In-Reply-To: <20060103145639.GC20353@thunk.org>
Hi,
On Tue, 3 Jan 2006, Theodore Ts'o wrote:
> Basically, the troll is Daniel Lyons, [...]
Oooh, I almost started to take this article serious enough to actually
read it.
Thanks,
Dscho
^ permalink raw reply
* Re: [PATCH] qgit: increase the space between the lanes.
From: Marco Costalba @ 2006-01-03 15:49 UTC (permalink / raw)
To: Martin Atukunda; +Cc: git
In-Reply-To: <200601031415.19309.matlads@dsmagic.com>
Martin Atukunda wrote:
> There are probably better ways of doing this.
>
> Signed-off-by: Martin Atukunda <matlads@dsmagic.com>
>
> ---
>
Thanks for the patch. Almost applied ;-)
The incresed lines spacing is good. But unluckly the merge/fork symbols
don't appear as good, at least in my box:
http://digilander.libero.it/mcostalba/qgitOriginal.png
http://digilander.libero.it/mcostalba/qgitModified.png
If it _could_ be possible to fill with color the merge symbols it would be great.
Do you mind to do it yourself? if not I will do that.
Thanks
Marco
___________________________________
Yahoo! Mail: gratis 1GB per i messaggi e allegati da 10MB
http://mail.yahoo.it
^ permalink raw reply
* Re: [PATCH] qgit: increase the space between the lanes.
From: Martin Atukunda @ 2006-01-03 16:49 UTC (permalink / raw)
To: git
In-Reply-To: <43BA9CFA.8050208@yahoo.it>
On Tuesday 03 January 2006 18:49, Marco Costalba wrote:
>
> If it _could_ be possible to fill with color the merge symbols it would be
> great.
>
> Do you mind to do it yourself? if not I will do that.
Something like this?
---
[PATCH] qgit: increase the space between the lanes.
This commit increases the space between the lanes. It also cators/adjusts for
the look of the merge/fork symbols.
Signed-off-by: Martin Atukunda <matlads@dsmagic.com>
---
src/mainimpl.cpp | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
eb82c3b5bda7970bf743a3b1fa9df8a943f3b9ed
diff --git a/src/mainimpl.cpp b/src/mainimpl.cpp
index d7c4e39..9430e1b 100644
--- a/src/mainimpl.cpp
+++ b/src/mainimpl.cpp
@@ -1409,7 +1409,7 @@ void MainImpl::setupPixmaps() {
// little hack to read items height
new QListViewItem(listViewLog);
ph = listViewLog->firstChild()->height();
- pw = ph / 2;
+ pw = ph / 2 + 4;
listViewLog->clear(); // remove and deletes items
QPixmap cm(pw, ph);
cm.fill();
@@ -1443,17 +1443,17 @@ void MainImpl::setupPixmaps() {
case MERGE_FORK:
p.drawLine(P_90, P_270);
p.drawLine(P_180, P_0);
- p.drawRect(pw/4, ph/4, pw/2, ph/2);
+ p.drawRect(pw/4+1, ph/4, pw/2-1, ph/2);
break;
case MERGE_FORK_R:
p.drawLine(P_90, P_270);
p.drawLine(P_180, P_OR);
- p.drawRect(pw/4, ph/4, pw/2, ph/2);
+ p.drawRect(pw/4+1, ph/4, pw/2-1, ph/2);
break;
case MERGE_FORK_L:
p.drawLine(P_90, P_270);
p.drawLine(P_OR, P_0);
- p.drawRect(pw/4, ph/4, pw/2, ph/2);
+ p.drawRect(pw/4+1, ph/4, pw/2-1, ph/2);
break;
case JOIN:
p.drawLine(P_90, P_270);
--
1.0.6-g58e3
^ permalink raw reply related
* Re: [PATCH] qgit: increase the space between the lanes.
From: Martin Atukunda @ 2006-01-03 17:07 UTC (permalink / raw)
To: git
In-Reply-To: <200601031949.59822.matlads@dsmagic.com>
On Tuesday 03 January 2006 19:49, Martin Atukunda wrote:
> On Tuesday 03 January 2006 18:49, Marco Costalba wrote:
> > If it _could_ be possible to fill with color the merge symbols it would
> > be great.
> >
> > Do you mind to do it yourself? if not I will do that.
>
> Something like this?
Sorry, but it appears that the patches i've been sending out work only for
certain font sizes! Hmmm.
see these 3 screenshots (with the previous patch):
http://mail.ds.co.ug/~matlads/qgit/
Hmm, I need to re-think how to do this properly. Any ideas?
- Martin -
^ permalink raw reply
* Re: Howto send many commits as mail-patches?
From: Ryan Anderson @ 2006-01-03 17:24 UTC (permalink / raw)
To: Sam Ravnborg; +Cc: git
In-Reply-To: <20060103113859.GA15832@mars.ravnborg.org>
On Tue, Jan 03, 2006 at 12:38:59PM +0100, Sam Ravnborg wrote:
> Hi all.
>
> I have a collection of commits in my GIT repository that I like to send
> out to linux-kernel.
> But my initial experiments with git-send-emails.perl fall out bad.
>
> I did the following:
>
> 1) First I created a mbox with the patches:
> git format-patch -n --mbox --stdout -M -B b286e39207237e2f6929959372bf66d9a8d05a82 > mbox
> The mbox looked OK. -M -B were from the man page and since the patchset
> includes a number of renames it made the mbox considerably smaller.
>
> So I went on an tried to send the mails:
>
> It just send out two huge mails containing all of the mbox.
> Also it cc:ed all people included in "Signed-off-by". That is sometimes
> a nice feature but for testing I like it to be optional.
>
> Can someone give me a nice howto so I can see how to send out the mails.
Try:
mkdir ../pending/
git format-patch -n --mbox -o ../pending/ -M -B b286e39207237e2f6929959372bf66d9a8d05a82
git-send-email.perl --from "Sam Ravnborg <sam@ravnborg.org>" --to "sam@ravnborg.org" --chain-reply-to "" ../pending/
With this method, you can examine the files in ../pending/, edit patch
comments if you want, add an "introductory" mail, etc.
The Signed-off-by: cc:ing is currently not something that can be
disabled, but you can do something like this to stop it temporarily:
(cut and pasted, so it probably won't directly apply)
diff --git a/git-send-email.perl b/git-send-email.perl
index ec1428d..9c7d0b8 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -322,7 +322,7 @@ foreach my $t (@files) {
}
} else {
$message .= $_;
- if (/^Signed-off-by: (.*)$/i) {
+ if (/^XSigned-off-by: (.*)$/i) {
my $c = $1;
chomp $c;
push @cc, $c;
Hope that helped,
--
Ryan Anderson
sometimes Pug Majere
^ permalink raw reply related
* Re: how to find outstanding patches in non-linux-2.6 repositories ?
From: Jon Loeliger @ 2006-01-03 19:11 UTC (permalink / raw)
To: Git List
In-Reply-To: <Pine.LNX.4.63.0601012228470.32311@wbgn013.biozentrum.uni-wuerzburg.de>
On Sun, 2006-01-01 at 15:32, Johannes Schindelin wrote:
> Preferrable is the following:
>
> cd /existing/clone/of/ppc-linux # OP said he had this already
> git fetch \
> git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
> \
> master:refs/heads/linus
> git-whatchanged linus..HEAD
Could someone remind me where the <ref>..<ref> syntax
is documented, please? I went digging, but I am lame
and couldn't find it.
Thanks,
jdl
^ permalink raw reply
* Re: how to find outstanding patches in non-linux-2.6 repositories ?
From: Marco Roeland @ 2006-01-03 19:21 UTC (permalink / raw)
To: Jon Loeliger; +Cc: Git List
In-Reply-To: <1136315518.11946.28.camel@cashmere.sps.mot.com>
On Tuesday January 3rd 2006 Jon Loeliger wrote:
> Could someone remind me where the <ref>..<ref> syntax
> is documented, please? I went digging, but I am lame
> and couldn't find it.
It is in the documentation for git-rev-list:
In the "Description" section for git-rev-list:
A special notation <commit1>..<commit2> can be used as a short-hand for
^<commit1> <commit2>.
--
Marco Roeland
^ permalink raw reply
* Re: how to find outstanding patches in non-linux-2.6 repositories ?
From: Andreas Ericsson @ 2006-01-03 19:35 UTC (permalink / raw)
To: Jon Loeliger; +Cc: Git List
In-Reply-To: <1136315518.11946.28.camel@cashmere.sps.mot.com>
Jon Loeliger wrote:
>
> Could someone remind me where the <ref>..<ref> syntax
> is documented, please? I went digging, but I am lame
> and couldn't find it.
>
'man git-rev-parse' gets you the <committish> explanation. A ref is tag
or a branch, and those are committish. A range such as
<committish1>..<committish2> means "include all commits since and
including <committish1>, leading up to (and including) <committish2>".
When Linus generates patches for the kernel he uses tags as <committish>
and does something like this:
git diff v2.6.14..v2.6.15 | gzip -9f > linux-2.6.14-2.6.15.patch.gz
You can mix tags, commits and branches any way you like, so long as you
get the commitological order right. That is, <committish2> should refer
to a descendant of <committish1>.
"origin..HEAD" is a valid and fairly common range.
"HEAD..origin" is not (well, it is, but it doesn't include any commits
since it's going backwards).
I don't know where to find a more complete explanation, but at least
google should provide this one once it has gotten round to indexing this
mail.
Now lets just have to hope I didn't get it all wrong. :)
--
Andreas Ericsson andreas.ericsson@op5.se
OP5 AB www.op5.se
Tel: +46 8-230225 Fax: +46 8-230231
^ permalink raw reply
* Re: how to find outstanding patches in non-linux-2.6 repositories ?
From: Linus Torvalds @ 2006-01-03 19:41 UTC (permalink / raw)
To: Jon Loeliger; +Cc: Git List
In-Reply-To: <1136315518.11946.28.camel@cashmere.sps.mot.com>
On Tue, 3 Jan 2006, Jon Loeliger wrote:
>
> Could someone remind me where the <ref>..<ref> syntax
> is documented, please? I went digging, but I am lame
> and couldn't find it.
Hmm. It probably isn't. Technically, "start..end" is exactly the same
thing as "end" + "^start", with an empty "end" being the same as HEAD (an
empty "start" is largely meaningless and isn't supported - we _could_ make
it mean the same as just specifying "end").
You can see this with "git-rev-parse":
[torvalds@g5 linux]$ git-rev-parse v2.6.12..v2.6.15
88026842b0a760145aa71d69e74fbc9ec118ca44
^26791a8bcf0e6d33f43aef7682bdb555236d56de
ie it really does literally that transformation.
NOTE! Normally the "a" + "^b" format just means "everything that is
reachable through "a", but not reachable through "b". In other words, it
almost always ends up being a "commit set operation", and you can combine
it with other "set" operations (like "--before=<date>" or other limiters).
But there is one special case: "git diff" will consider that to be a range
of end-points, and will generate a diff from "b" to "a". It will do this
regardless of whether "a" and "b" are even related, and it will _not_ care
about set differences.
So there's a very fundamental difference between two things that
_syntactically_ look very similar:
git log a..b
and
git diff a..b
may look like they are related, but they really really are not. They are
very very different.
The "git log" thing will show the commit log for every commit that is in
"b" but not in "a". HOWEVER, if there's something in "a" that is not in
"b" it will totally ignore it - it _literally_ means "show everything that
is reachable from "b" but not reachable from "a".
So doing "git log a..b" and "git log b..a" are _not_ "reverse" operations.
They show totally disjunct sets. If one is a superset of the other, one of
those will be empty. But if they have different development, the two "git
log" commands will show what happened on one side but not the other.
In contrast, "git diff a..b" will show the raw differences between two
heads. So doing "git diff a..b" and "git diff b..a" is exactly the same
thing, the diff will just be "reversed". It's not an operation on a set of
commits: it's purely an operation on the two end-points.
So keep this in mind: the meaning of "a..b" actually depends on the
operation you do, although in all cases it will be exactly equivalent to
"a" and "^b" (with the special case for an empty "a" meaning HEAD).
Linus
^ permalink raw reply
* Re: [OT] Shameless troll ;o)
From: H. Peter Anvin @ 2006-01-03 19:42 UTC (permalink / raw)
To: Theodore Ts'o; +Cc: walt, git
In-Reply-To: <20060103145639.GC20353@thunk.org>
Theodore Ts'o wrote:
> On Mon, Jan 02, 2006 at 05:22:18PM -0800, walt wrote:
>
>>Forbes magazine just published an interview with OpenBSD's
>>leader, Theo-The-Rat, who managed to insult almost everyone
>>in the open-source community -- including our own Linus, of
>>course.
>
>
> If by "Just Published" you mean over six months ago, maybe.
> Basically, the troll is Daniel Lyons, a Forbes writer who at every
> opportunity tries to trash Linux. Just ignore him; or better yet,
> cancel your Forbes subscription, and a send a note to the Forbes
> publishers saying why. I've completely lost any respect I've had for
> the Forbes magazine, partially as a result of the multiple dreck
> masquerading as articles published by Dan Lyons. Speaking personally,
> I believe there are much better places for me to get my business news,
> including Business Week and the Economist.
>
Look on Groklaw if you want to know more about Mr. Lyons and the stuff
he's published.
-hpa
^ permalink raw reply
* Re: [OT] Shameless troll ;o)
From: Linus Torvalds @ 2006-01-03 20:09 UTC (permalink / raw)
To: H. Peter Anvin; +Cc: Theodore Ts'o, walt, git
In-Reply-To: <43BAD395.5090801@zytor.com>
On Tue, 3 Jan 2006, H. Peter Anvin wrote:
>
> Look on Groklaw if you want to know more about Mr. Lyons and the stuff he's
> published.
Well, in the defense of Dan Lyons, I think he's been somewhat vilified,
and has had a perfectly human reaction of striking back.
He tends to look for problems, but not every piece he has written has been
negative. In fact, some of them haven't been _nearly_ as negative as they
have then been purported to be in groklaw. I think groklaw has had a
somewhat unfortunate "either you're with us, or you're against us" herd
mentality.
The fact that Lyons then has been negative towards groklaw has just
cemented that bad situation further.
It's interesting that Ted piped up, because I know that IBM has had the
exact same problem with Lyons. He wrote some negative article, at which
point IBM told its engineers not to talk to him any more, which caused
subsequent articles to be negative too.
Yes, Forbes is pretty bad. It's a "rah rah" magazine for people who wished
they were rich. It's a small step up from the check-out counter magazines
that alternately glorify and vilify Jessica Simpson or whoever is the
celebrity of the week.
There's no question that you're better off with the Wall Street Journal
(who has some of the best journalists in the business, as far as I can
tell, and while I don't know crud about business, I _do_ know journalistm)
or the Economist if you actually care about business and economy. But
that's not what Forbes is about.
Quite frankly, I've seen Dan Lyons work, and my opinion is that he's a
better journalist than many. He may be opinionated and swayed by negative
feelings, but I've seen at least two stories that he actually did research
himself, and followed up on. The end result can be skewed by his feelings,
but that's still a hell of a lot more than some people will do.
So give people their due, even when you disagree with them occasionally.
And understand that journalists are very much people too, and react badly
to the kind of totally uncalled for name-calling that Dan Lyons has gotten
on groklaw over the last year or two (yeah, he got things wrong for one of
his first pieces on the SCO saga. And he doesn't like IBM, and I can
pretty much guarantee you that he _detests_ groklaw by now. And it will
show in his reporting.).
Linus
^ permalink raw reply
* Re: [PATCH] qgit: increase the space between the lanes.
From: Marco Costalba @ 2006-01-03 22:17 UTC (permalink / raw)
To: Martin Atukunda; +Cc: git
In-Reply-To: <200601032007.09081.matlads@dsmagic.com>
Martin Atukunda wrote:
>
> Hmm, I need to re-think how to do this properly. Any ideas?
>
Hi Martin,
What about this?
If it is Ok for you I will push the change.
Marco
diff --git a/src/mainimpl.cpp b/src/mainimpl.cpp
index 2f26b01..40a22e8 100644
--- a/src/mainimpl.cpp
+++ b/src/mainimpl.cpp
@@ -1451,7 +1451,7 @@ void MainImpl::setupPixmaps() {
// little hack to read items height
new QListViewItem(listViewLog);
ph = listViewLog->firstChild()->height();
- pw = ph / 2;
+ pw = 3 * ph / 4;
listViewLog->clear(); // remove and deletes items
QPixmap cm(pw, ph);
cm.fill();
@@ -1470,12 +1470,13 @@ void MainImpl::setupPixmaps() {
p.begin(pm);
p.setPen(QPen(colors[i % COLORS_NUM], 2));
int type = (i / COLORS_NUM) + 1;
+ QBrush myBrush(QBrush(colors[i % COLORS_NUM], Qt::SolidPattern));
switch(type) {
case ACTIVE:
p.drawLine(P_90, P_270);
p.save();
p.setPen(QPen(colors[i % COLORS_NUM], 1));
- p.setBrush(QBrush(colors[i % COLORS_NUM], Qt::SolidPattern));
+ p.setBrush(myBrush);
p.drawEllipse(pw/8, ph/8, 6*pw/8, 3*ph/8);
p.restore();
break;
@@ -1485,17 +1486,20 @@ void MainImpl::setupPixmaps() {
case MERGE_FORK:
p.drawLine(P_90, P_270);
p.drawLine(P_180, P_0);
- p.drawRect(pw/4, ph/4, pw/2, ph/2);
+ p.fillRect (pw/4, ph/4, pw/2, ph/2, myBrush);
+ p.drawRoundRect(pw/4, ph/4, pw/2, ph/2, 25, 25);
break;
case MERGE_FORK_R:
p.drawLine(P_90, P_270);
p.drawLine(P_180, P_OR);
- p.drawRect(pw/4, ph/4, pw/2, ph/2);
+ p.fillRect (pw/4, ph/4, pw/2, ph/2, myBrush);
+ p.drawRoundRect(pw/4, ph/4, pw/2, ph/2, 25, 25);
break;
case MERGE_FORK_L:
p.drawLine(P_90, P_270);
p.drawLine(P_OR, P_0);
- p.drawRect(pw/4, ph/4, pw/2, ph/2);
+ p.fillRect (pw/4, ph/4, pw/2, ph/2, myBrush);
+ p.drawRoundRect(pw/4, ph/4, pw/2, ph/2, 25, 25);
break;
case JOIN:
p.drawLine(P_90, P_270);
___________________________________
Yahoo! Mail: gratis 1GB per i messaggi e allegati da 10MB
http://mail.yahoo.it
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox