* [PATCH 2/5] upload-pack: Check for NOT_SHALLOW flag before sending a shallow to the client.
@ 2006-11-24 14:58 Alexandre Julliard
0 siblings, 0 replies; only message in thread
From: Alexandre Julliard @ 2006-11-24 14:58 UTC (permalink / raw)
To: git
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 <julliard@winehq.org>
---
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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2006-11-24 14:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-11-24 14:58 [PATCH 2/5] upload-pack: Check for NOT_SHALLOW flag before sending a shallow to the client Alexandre Julliard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).