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

diff --cc builtin/gc.c
index 0bf35334942ca0e5ad7bb0821b89d56fed1af07d,8656e1caff0990a81f18a440b73d276f1a5fe7e0..409d454a4b711303452abd0072a7fa13e45c2617
--- 1/builtin/gc.c
--- 2/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 { \

diff --cc t/t6500-gc.sh
Simple merge