summaryrefslogtreecommitdiff
path: root/fetch-clone.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-08-12 18:34:36 -0700
committerJunio C Hamano <junkio@cox.net>2006-08-12 18:35:14 -0700
commiteed94a570e0421175d6b4342c0ac48e03ceedf0b (patch)
treef33864f2abffdcb83cbf626b26da34f9cc8d5bab /fetch-clone.c
parent4147d801db66df9b127ffe315601f467aa9d1c48 (diff)
parent01aaf1f88ddc2b99162c302710339f202996f39b (diff)
downloadgit-eed94a570e0421175d6b4342c0ac48e03ceedf0b.tar.gz
Merge branch 'master' into js/c-merge-recursive
Adjust to hold_lock_file_for_update() change on the master.
Diffstat (limited to 'fetch-clone.c')
-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: