summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-03-14 19:01:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-03-14 19:01:06 (GMT)
commit99321e327b4df8d9d6724cf26bab7429edbdb718 (patch)
tree634f157cdbf88c274d9321dafb8de6d67e4b3781
parent88506cb887254b5950fe330cc720e94a6058d239 (diff)
parent3d1cf1e8e1552ae82178bb52953772495f5fd326 (diff)
downloadgit-99321e327b4df8d9d6724cf26bab7429edbdb718.zip
git-99321e327b4df8d9d6724cf26bab7429edbdb718.tar.gz
git-99321e327b4df8d9d6724cf26bab7429edbdb718.tar.bz2
Merge branch 'nd/object-allocation-comments'
Code doc update. * nd/object-allocation-comments: object.h: realign object flag allocation comment object.h: update flag allocation comment
-rw-r--r--builtin/index-pack.c1
-rw-r--r--builtin/pack-objects.c1
-rw-r--r--builtin/reflog.c1
-rw-r--r--builtin/unpack-objects.c1
-rw-r--r--object.h28
5 files changed, 20 insertions, 12 deletions
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 59878e7..9791d42 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -49,6 +49,7 @@ struct thread_local {
int pack_fd;
};
+/* Remember to update object flag allocation in object.h */
#define FLAG_LINK (1u<<20)
#define FLAG_CHECKED (1u<<21)
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index a197926..e9d3cfb 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -2549,6 +2549,7 @@ static void read_object_list_from_stdin(void)
}
}
+/* Remember to update object flag allocation in object.h */
#define OBJECT_ADDED (1u<<20)
static void show_commit(struct commit *commit, void *data)
diff --git a/builtin/reflog.c b/builtin/reflog.c
index ac3dcd7..4719a53 100644
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -52,6 +52,7 @@ struct collect_reflog_cb {
int nr;
};
+/* Remember to update object flag allocation in object.h */
#define INCOMPLETE (1u<<10)
#define STUDYING (1u<<11)
#define REACHABLE (1u<<12)
diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c
index 9f96949..6620fee 100644
--- a/builtin/unpack-objects.c
+++ b/builtin/unpack-objects.c
@@ -158,6 +158,7 @@ struct obj_info {
struct object *obj;
};
+/* Remember to update object flag allocation in object.h */
#define FLAG_OPEN (1u<<20)
#define FLAG_WRITTEN (1u<<21)
diff --git a/object.h b/object.h
index a5eb263..f13f85b 100644
--- a/object.h
+++ b/object.h
@@ -28,18 +28,22 @@ struct object_array {
#define TYPE_BITS 3
/*
* object flag allocation:
- * revision.h: 0---------10 26
- * fetch-pack.c: 0---5
- * walker.c: 0-2
- * upload-pack.c: 4 11----------------19
- * builtin/blame.c: 12-13
- * bisect.c: 16
- * bundle.c: 16
- * http-push.c: 16-----19
- * commit.c: 16-----19
- * sha1_name.c: 20
- * list-objects-filter.c: 21
- * builtin/fsck.c: 0--3
+ * revision.h: 0---------10 26
+ * fetch-pack.c: 0----5
+ * walker.c: 0-2
+ * upload-pack.c: 4 11----------------19
+ * builtin/blame.c: 12-13
+ * bisect.c: 16
+ * bundle.c: 16
+ * http-push.c: 16-----19
+ * commit.c: 16-----19
+ * sha1_name.c: 20
+ * list-objects-filter.c: 21
+ * builtin/fsck.c: 0--3
+ * builtin/index-pack.c: 2021
+ * builtin/pack-objects.c: 20
+ * builtin/reflog.c: 10--12
+ * builtin/unpack-objects.c: 2021
*/
#define FLAG_BITS 27