Merge branch 'jn/send-pack-error' into maint

diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index 6019eac9182e22f2d485acdb83be209dbc49968a..8aa303158b2461c9272c8ca5b094149a54cc35d2 100644 (file)
--- 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;
 }
 
@@ -361,6 +361,10 @@ int send_pack(struct send_pack_args *args,
 
        if (ret < 0)
                return ret;
+
+       if (args->porcelain)
+               return 0;
+
        for (ref = remote_refs; ref; ref = ref->next) {
                switch (ref->status) {
                case REF_STATUS_NONE: