Skip to contentSkip to conversation

commit: use timestamp_t for author_date_slab

PATCH In review Derrick Stolee 2 participants 2 messages Aug 21, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 commit: use timestamp_t for author_date_slab

The author_date_slab is used to store the author date of a commit when walking with the --author-date flag in rev-list or log. This was added as an 'unsigned long' in

	81c6b38b "log: --author-date-order"

Since 'unsigned long' is ambiguous in its bit-ness across platforms (64-bit in Linux, 32-bit in Windows, for example), most references to the author dates in commit.c were converted to timestamp_t in

dddbad72 "timestamp_t: a new data type for timestamps"

However, the slab definition was missed, leading to a mismatch in the data types in Windows. This would not reveal itself as a bug unless someone authors a commit after February 2106, but commits can store anything as their author date.

---

I found this while reading up on the revision-walk machinery. This code hasn't been touched in years, so could apply to 'maint'.

 commit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
commit.c +1 -1
index 0030e79940..2ce5052b3e 100644
@@ -609,7 +609,7 @@ struct commit *pop_commit(struct commit_list **stack)
 define_commit_slab(indegree_slab, int);
 
 /* record author-date for each commit object */
-define_commit_slab(author_date_slab, unsigned long);
+define_commit_slab(author_date_slab, timestamp_t);
 
 static void record_author_date(struct author_date_slab *author_date,
 			       struct commit *commit)
Signature · 1 line
2.19.0.rc0
#1 lore raw
Quoted 6 lines · Derrick Stolee

The author_date_slab is used to store the author date of a commit when walking with the --author-date flag in rev-list or log. This was added as an 'unsigned long' in

	81c6b38b "log: --author-date-order"
Quoted 7 lines

Since 'unsigned long' is ambiguous in its bit-ness across platforms (64-bit in Linux, 32-bit in Windows, for example), most references to the author dates in commit.c were converted to timestamp_t in

dddbad72 "timestamp_t: a new data type for timestamps"

However, the slab definition was missed,

Makes sense, and obviously correct.

Quoted 2 lines

I found this while reading up on the revision-walk machinery. This code hasn't been touched in years, so could apply to 'maint'.

Thanks.