summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-11-17 15:00:51 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-11-17 15:00:51 -0800
commite2110c8d881eb61db581b6b9ddd9568f20cf24c7 (patch)
tree45f10d249c9e546cab47856a0b8c1d17eb42b45a /builtin
parentMerge branch 'mg/make-prove' (diff)
parentsend-pack: avoid redundant "pack-objects died with strange error" (diff)
downloadtgif-e2110c8d881eb61db581b6b9ddd9568f20cf24c7.tar.xz
Merge branch 'jn/send-pack-error'
* jn/send-pack-error: send-pack: avoid redundant "pack-objects died with strange error"
Diffstat (limited to 'builtin')
-rw-r--r--builtin/send-pack.c2
1 files changed, 1 insertions, 1 deletions
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;
}