[PATCH 2/5] upload-pack: Check for NOT_SHALLOW flag before sending a shallow to the client.
From: Alexandre Julliard <hidden>
Date: 2016-08-11 20:37:31
Subsystem:
the rest · Maintainer:
Linus Torvalds
A commit may have been put on the shallow list, and then reached from another branch and marked NOT_SHALLOW without being removed from the list. Signed-off-by: Alexandre Julliard <redacted> --- upload-pack.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/upload-pack.c b/upload-pack.c
index d5b4750..d4a7b62 100644
--- a/upload-pack.c
+++ b/upload-pack.c@@ -565,7 +565,7 @@ static void receive_needs(void) SHALLOW, NOT_SHALLOW); while (result) { struct object *object = &result->item->object; - if (!(object->flags & CLIENT_SHALLOW)) { + if (!(object->flags & (CLIENT_SHALLOW|NOT_SHALLOW))) { packet_write(1, "shallow %s", sha1_to_hex(object->sha1)); register_shallow(object->sha1);
--
1.4.4.1.ga335e
--
Alexandre Julliard