From dfa464781286e3a6fb1d56a834bb15ac7fc4fb16 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 1 Aug 2006 01:34:53 -0700 Subject: 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 --- fetch-clone.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fetch-clone.c b/fetch-clone.c index 81d1371296..692d9b750d 100644 --- a/fetch-clone.c +++ b/fetch-clone.c @@ -133,7 +133,10 @@ static pid_t setup_sideband(int sideband, const char *me, int fd[2], int xd[2]) 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); -- cgit v1.2.3 From 2de196fec1feba8350f272c567989595901bb67e Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 3 Aug 2006 16:01:58 -0700 Subject: sideband: do not use color, just say "remote:" ... per suggestion by Andrew. Signed-off-by: Junio C Hamano --- fetch-clone.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/fetch-clone.c b/fetch-clone.c index 692d9b750d..5e84c4620f 100644 --- a/fetch-clone.c +++ b/fetch-clone.c @@ -129,14 +129,13 @@ static pid_t setup_sideband(int sideband, const char *me, int fd[2], int xd[2]) len--; switch (buf[0] & 0xFF) { case 3: + safe_write(2, "remote: ", 8); safe_write(2, buf+1, len); - fprintf(stderr, "\n"); + safe_write(2, "\n", 1); exit(1); case 2: - /* color sideband */ - safe_write(2, "\033[44;37;1m", 10); + safe_write(2, "remote: ", 8); safe_write(2, buf+1, len); - safe_write(2, "\033[m", 3); continue; case 1: safe_write(fd[1], buf+1, len); -- cgit v1.2.3