From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 17 Nov 2010 23:00:51 +0000 (-0800)
Subject: Merge branch 'jn/send-pack-error'
X-Git-Tag: v1.7.4-rc0~137
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e2110c8d881eb61db581b6b9ddd9568f20cf24c7?hp=4739c19d7f905b326375083e60866e8977251ba3

Merge branch 'jn/send-pack-error'

* jn/send-pack-error:
send-pack: avoid redundant "pack-objects died with strange error"
---

diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index 481602d8ae..8aa303158b 100644
--- a/builtin/send-pack.c
+++ b/builtin/send-pack.c
@@ -101,7 +101,7 @@ static int pack_objects(int fd, struct ref *refs, struct extra_have_objects *ext
 	}
 
 	if (finish_command(&po))
-		return error("pack-objects died with strange error");
+		return -1;
 	return 0;
 }