From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 12 Feb 2025 18:08:53 +0000 (-0800)
Subject: Merge branch 'zh/gc-expire-to'
X-Git-Tag: v2.49.0-rc0~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5b9d01bc4d84a1e09087a0b9dad206e855f49bf2;p=thirdparty%2Fgit.git

Merge branch 'zh/gc-expire-to'

"git gc" learned the "--expire-to" option and passes it down to
underlying "git repack".

* zh/gc-expire-to:
  gc: add `--expire-to` option
---

5b9d01bc4d84a1e09087a0b9dad206e855f49bf2
diff --cc builtin/gc.c
index 0bf3533494,8656e1caff..409d454a4b
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@@ -139,13 -136,9 +139,14 @@@ struct gc_config 
  	char *prune_worktrees_expire;
  	char *repack_filter;
  	char *repack_filter_to;
+ 	char *repack_expire_to;
  	unsigned long big_pack_threshold;
  	unsigned long max_delta_cache_size;
 +	/*
 +	 * Remove this member from gc_config once repo_settings is passed
 +	 * through the callchain.
 +	 */
 +	size_t delta_base_cache_limit;
  };
  
  #define GC_CONFIG_INIT { \