summaryrefslogtreecommitdiff
path: root/bundle.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-04-03 12:38:11 -0700
committerJunio C Hamano <gitster@pobox.com>2014-04-03 12:38:11 -0700
commitb407d40933f9c37af16ca3dc275e615ab4fdd8c5 (patch)
treea22498a4d0d7d253f43cb2bde8b032b2374b12b2 /bundle.c
parent2b06c1e57eecde25ff762cc12939d8a6d8f143cc (diff)
parent1b32decefd840e0ca5d18eefd6472fd8624dd849 (diff)
downloadgit-b407d40933f9c37af16ca3dc275e615ab4fdd8c5.tar.gz
Merge branch 'nd/log-show-linear-break'
Attempts to show where a single-strand-of-pearls break in "git log" output. * nd/log-show-linear-break: log: add --show-linear-break to help see non-linear history object.h: centralize object flag allocation
Diffstat (limited to 'bundle.c')
-rw-r--r--bundle.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/bundle.c b/bundle.c
index a85e0e4532..1222952075 100644
--- a/bundle.c
+++ b/bundle.c
@@ -120,6 +120,7 @@ static int list_refs(struct ref_list *r, int argc, const char **argv)
return 0;
}
+/* Remember to update object flag allocation in object.h */
#define PREREQ_MARK (1u<<16)
int verify_bundle(struct bundle_header *header, int verbose)