Re: git+ssh://master.kernel.org/home/rmk/linux-2.6-arm.git

Re: git+ssh://master.kernel.org/home/rmk/linux-2.6-arm.git

[Junio C Hamano]

Andrew Morton <akpm@osdl.org> writes:

> 
> fyi, a git-fetch of this tree gives:
>
> error: refs/heads/devel does not point to a valid commit object!
> error: refs/heads/devel does not point to a valid commit object!
>
> Junio, I'm running git-core-1.4.0-1.fc5 - perhaps more recent gits are
> better at telling the user if the error is remote or local.  If not: whine ;)

I'd try this out and see what people think.

-- >8 --
[PATCH] fetch/clone: mark messages from remote side stand out.

When dealing with a corrupt or out of sync remote repository,
the user often gets error messages like this:

	error: refs/heads/devel does not point to a valid commit object!

which leaves the user wondering if the breakage is on the local
end or on the remote end.  This is unnecessarily alarming.

This patch changes the way we display messages received from the
remote side over the git protocol sideband (i.e. stderr stream
of the remote process).  It shows them with blue background with
white letters, but this presentation is subject to proposals of
better ways from the list.

The problem was pointed out by Andrew Morton.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---
 fetch-clone.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/fetch-clone.c b/fetch-clone.c
index 81d1371..692d9b7 100644
--- a/fetch-clone.c
+++ b/fetch-clone.c
@@ -133,7 +133,10 @@ static pid_t setup_sideband(int sideband
 				fprintf(stderr, "\n");
 				exit(1);
 			case 2:
+				/* color sideband */
+				safe_write(2, "\033[44;37;1m", 10);
 				safe_write(2, buf+1, len);
+				safe_write(2, "\033[m", 3);
 				continue;
 			case 1:
 				safe_write(fd[1], buf+1, len);
-- 
1.4.2.rc2.gb9f77

Re: git+ssh://master.kernel.org/home/rmk/linux-2.6-arm.git

[Andrew Morton]

On Tue, 01 Aug 2006 01:46:03 -0700
Junio C Hamano <junkio@cox.net> wrote:

> It shows them with blue background with
> white letters, but this presentation is subject to proposals of
> better ways from the list.

eek.  If any application on my machine starts emitting funny colours I'll
immediately stop everything and go work out how to make it stop ;)

It would be more traditional to stick "remote:" at the beginning of the
message or something.

Re: git+ssh://master.kernel.org/home/rmk/linux-2.6-arm.git

[Junio C Hamano]

Andrew Morton <akpm@osdl.org> writes:

> On Tue, 01 Aug 2006 01:46:03 -0700
> Junio C Hamano <junkio@cox.net> wrote:
>
>> It shows them with blue background with
>> white letters, but this presentation is subject to proposals of
>> better ways from the list.
>
> eek.  If any application on my machine starts emitting funny colours I'll
> immediately stop everything and go work out how to make it stop ;)
>
> It would be more traditional to stick "remote:" at the beginning of the
> message or something.

Hehehe.  I succeeded getting your attention ;-).