Merge branch 'jc/sideband'

* jc/sideband:
sideband: do not use color, just say "remote:"
fetch/clone: mark messages from remote side stand out.

diff --git a/fetch-clone.c b/fetch-clone.c
index 81d13712962dfcf16c4f0f5a574b6950f6c3f154..5e84c4620ff96f5c7ab93e5f3bfd10609edd5fd5 100644 (file)
--- a/fetch-clone.c
+++ b/fetch-clone.c
@@ -129,10 +129,12 @@ 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:
+                               safe_write(2, "remote: ", 8);
                                safe_write(2, buf+1, len);
                                continue;
                        case 1: