git-merge: document the -S option

diff --git a/upload-pack.c b/upload-pack.c
index 289717ed5f239f28bf5c2dc10155e866ff56cb2d..04a8707bb58e7411a2c272a2716e6b8b340a2c7e 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -40,7 +40,7 @@ static struct object_array have_obj;
 static struct object_array want_obj;
 static struct object_array extra_edge_obj;
 static unsigned int timeout;
-static int keepalive = -1;
+static int keepalive = 5;
 /* 0 for no sideband,
  * otherwise maximum packet size (up to 65520 bytes).
  */
@@ -610,7 +610,7 @@ static void receive_needs(void)
                                die("invalid shallow line: %s", line);
                        object = parse_object(sha1);
                        if (!object)
-                               die("did not find object for %s", line);
+                               continue;
                        if (object->type != OBJ_COMMIT)
                                die("invalid shallow object %s", sha1_to_hex(sha1));
                        if (!(object->flags & CLIENT_SHALLOW)) {