aboutsummaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-11-24 12:46:46 -0800
committerJunio C Hamano <gitster@pobox.com>2010-11-24 12:46:46 -0800
commitd2a99221a768e2a231338fbe17d92ffa7e0458af (patch)
tree001afe0a270e0b89cb7c9a08fae10b618dd89b0b /builtin
parenta274f5b21d32adca60572fc8dd2a7560ccf041a8 (diff)
parent64f003abd9fbb155a6331365c0783b926185882c (diff)
downloadgit-d2a99221a768e2a231338fbe17d92ffa7e0458af.tar.gz
git-d2a99221a768e2a231338fbe17d92ffa7e0458af.tar.xz
Merge branch 'jn/send-pack-error' into maint
* 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 481602d8a..8aa303158 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;
}