diff options
| author | Alexandre Julliard <julliard@winehq.org> | 2006-11-24 15:58:25 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-11-24 15:42:50 -0800 |
| commit | 1f2de769812f0adea598269d788c9c75d23e80b8 (patch) | |
| tree | 133c070d69b41eb3f2adc654265098708d39a7af | |
| parent | d6491e3a214541aeb016b0688d0920845b03932d (diff) | |
| download | git-1f2de769812f0adea598269d788c9c75d23e80b8.tar.gz git-1f2de769812f0adea598269d788c9c75d23e80b8.tar.xz | |
upload-pack: Check for NOT_SHALLOW flag before sending a shallow to the client.
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>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | upload-pack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/upload-pack.c b/upload-pack.c index d5b47507d..d4a7b625f 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); |