summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-08-03 16:02:14 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-08-03 16:02:14 -0700
commit962ad61874267b715311b424c767d36c1ab921a6 (patch)
tree85309fe749b11c962bc1b11164bcf7729edf3ff0
parentShow both blob names from "git diff blob1 blob2" (diff)
parentsideband: do not use color, just say "remote:" (diff)
downloadtgif-962ad61874267b715311b424c767d36c1ab921a6.tar.xz
Merge branch 'jc/sideband'
* jc/sideband: sideband: do not use color, just say "remote:" fetch/clone: mark messages from remote side stand out.
-rw-r--r--fetch-clone.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fetch-clone.c b/fetch-clone.c
index 81d1371296..5e84c4620f 100644
--- 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: