summaryrefslogtreecommitdiff
path: root/object.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-06-25 20:22:35 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-06-25 20:22:35 (GMT)
commitb3b2aaf0fd6c65f83d5f636bb177d96c88079b13 (patch)
treeeaa7c8b7182b645e65f26278113f5d3a9e7b13a8 /object.h
parentea27893a65cc41cad2710466aa6a58866ff22f1e (diff)
parent9d2c97016fa09584337273ba6503e91e7c20d28e (diff)
downloadgit-b3b2aaf0fd6c65f83d5f636bb177d96c88079b13.zip
git-b3b2aaf0fd6c65f83d5f636bb177d96c88079b13.tar.gz
git-b3b2aaf0fd6c65f83d5f636bb177d96c88079b13.tar.bz2
Merge branch 'nd/commit-util-to-slab'
The in-core "commit" object had an all-purpose "void *util" field, which was tricky to use especially in library-ish part of the code. All of the existing uses of the field has been migrated to a more dedicated "commit-slab" mechanism and the field is eliminated. * nd/commit-util-to-slab: commit.h: delete 'util' field in struct commit merge: use commit-slab in merge remote desc instead of commit->util log: use commit-slab in prepare_bases() instead of commit->util show-branch: note about its object flags usage show-branch: use commit-slab for commit-name instead of commit->util name-rev: use commit-slab for rev-name instead of commit->util bisect.c: use commit-slab for commit weight instead of commit->util revision.c: use commit-slab for show_source sequencer.c: use commit-slab to associate todo items to commits sequencer.c: use commit-slab to mark seen commits shallow.c: use commit-slab for commit depth instead of commit->util describe: use commit-slab for commit names instead of commit->util blame: use commit-slab for blame suspects instead of commit->util commit-slab: support shared commit-slab commit-slab.h: code split
Diffstat (limited to 'object.h')
-rw-r--r--object.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/object.h b/object.h
index 5c13955..acc560b 100644
--- a/object.h
+++ b/object.h
@@ -42,6 +42,7 @@ struct object_array {
* builtin/index-pack.c: 2021
* builtin/pack-objects.c: 20
* builtin/reflog.c: 10--12
+ * builtin/show-branch.c: 0-------------------------------------------26
* builtin/unpack-objects.c: 2021
*/
#define FLAG_BITS 27