From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 28 Apr 2020 22:50:02 +0000 (-0700)
Subject: Merge branch 'ds/commit-graph-expiry-fix'
X-Git-Tag: v2.27.0-rc0~89
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=25b336421f7393f54bada27f60658fdfe7270215;p=thirdparty%2Fgit.git

Merge branch 'ds/commit-graph-expiry-fix'

"git commit-graph write --expire-time=<timestamp>" did not use the
given timestamp correctly, which has been corrected.

* ds/commit-graph-expiry-fix:
  commit-graph: fix buggy --expire-time option
---

25b336421f7393f54bada27f60658fdfe7270215
diff --cc commit-graph.c
index f013a84e29,4df4326b50..0d0d37787a
--- a/commit-graph.c
+++ b/commit-graph.c
@@@ -1707,9 -1694,9 +1707,9 @@@ static void expire_commit_graphs(struc
  	timestamp_t expire_time = time(NULL);
  
  	if (ctx->split_opts && ctx->split_opts->expire_time)
- 		expire_time -= ctx->split_opts->expire_time;
+ 		expire_time = ctx->split_opts->expire_time;
  	if (!ctx->split) {
 -		char *chain_file_name = get_chain_filename(ctx->obj_dir);
 +		char *chain_file_name = get_chain_filename(ctx->odb);
  		unlink(chain_file_name);
  		free(chain_file_name);
  		ctx->num_commit_graphs_after = 0;