Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
upload-pack: Check for NOT_SHALLOW flag before sending a shallow to t…
Browse files Browse the repository at this point in the history
…he 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>
  • Loading branch information
julliard authored and Junio C Hamano committed Nov 24, 2006
1 parent d6491e3 commit 1f2de76
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion upload-pack.c
Expand Up @@ -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);
Expand Down

0 comments on commit 1f2de76

Please sign in to comment.