summaryrefslogtreecommitdiff
path: root/upload-pack.c
diff options
context:
space:
mode:
authorAlexandre Julliard <julliard@winehq.org>2006-11-24 14:58:25 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-11-24 23:42:50 (GMT)
commit1f2de769812f0adea598269d788c9c75d23e80b8 (patch)
tree133c070d69b41eb3f2adc654265098708d39a7af /upload-pack.c
parentd6491e3a214541aeb016b0688d0920845b03932d (diff)
downloadgit-1f2de769812f0adea598269d788c9c75d23e80b8.zip
git-1f2de769812f0adea598269d788c9c75d23e80b8.tar.gz
git-1f2de769812f0adea598269d788c9c75d23e80b8.tar.bz2
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>
Diffstat (limited to 'upload-pack.c')
-rw-r--r--upload-pack.c2
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);