summaryrefslogtreecommitdiff
path: root/builtin-bundle.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-03-06 00:10:28 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-03-06 09:08:34 (GMT)
commit2b064697a5b0610254f52523ce5b70c81118da80 (patch)
tree4b84bfcc341ed1764f599baf8203d842322a8ea3 /builtin-bundle.c
parent86ab4906a7c86719cae33b28dac1a4157d665867 (diff)
downloadgit-2b064697a5b0610254f52523ce5b70c81118da80.zip
git-2b064697a5b0610254f52523ce5b70c81118da80.tar.gz
git-2b064697a5b0610254f52523ce5b70c81118da80.tar.bz2
revision traversal: retire BOUNDARY_SHOW
This removes the flag internally used by revision traversal to decide which commits are indeed boundaries and renames it to CHILD_SHOWN. builtin-bundle uses the symbol for its verification, but I think the logic it uses it is wrong. The flag is still useful but it is local to the git-bundle, so it is renamed to PREREQ_MARK. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-bundle.c')
-rw-r--r--builtin-bundle.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/builtin-bundle.c b/builtin-bundle.c
index 279b8f8..76bd204 100644
--- a/builtin-bundle.c
+++ b/builtin-bundle.c
@@ -160,6 +160,8 @@ static int fork_with_pipe(const char **argv, int *in, int *out)
return pid;
}
+#define PREREQ_MARK (1u<<16)
+
static int verify_bundle(struct bundle_header *header)
{
/*
@@ -179,7 +181,7 @@ static int verify_bundle(struct bundle_header *header)
struct ref_list_entry *e = p->list + i;
struct object *o = parse_object(e->sha1);
if (o) {
- o->flags |= BOUNDARY_SHOW;
+ o->flags |= PREREQ_MARK;
add_pending_object(&revs, o, e->name);
continue;
}
@@ -202,7 +204,7 @@ static int verify_bundle(struct bundle_header *header)
i = req_nr;
while (i && (commit = get_revision(&revs)))
- if (commit->object.flags & BOUNDARY_SHOW)
+ if (commit->object.flags & PREREQ_MARK)
i--;
for (i = 0; i < req_nr; i++)