]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'tb/send-pack-no-ref-delta' into seen
authorJunio C Hamano <gitster@pobox.com>
Thu, 30 Jul 2026 17:44:36 +0000 (10:44 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Jul 2026 17:44:37 +0000 (10:44 -0700)
'git send-pack' has been taught to refrain from sending 'REF_DELTA'
encoded packfiles when the other side asks it to.

* tb/send-pack-no-ref-delta:
  send-pack: honor `no-ref-delta` capability
  pack-objects: support reuse with `--no-ref-delta`
  pack-objects: introduce `--no-ref-delta`
  t/helper: teach pack-deltas to list delta entries

1  2 
Documentation/git-pack-objects.adoc
builtin/pack-objects.c
builtin/receive-pack.c
pack-bitmap.c
pack-bitmap.h
t/helper/test-pack-deltas.c
t/t5300-pack-object.sh
t/t5516-fetch-push.sh

Simple merge
index 400d359daac4cde4513c27a0ea125b69b8a5af1b,43cd4be2e5e284ef4fb2177f6b24c8a365e3c0f8..75712b7786318eadcf92528940869ae0dd345c70
@@@ -220,9 -220,9 +221,10 @@@ static int incremental
  static int ignore_packed_keep_on_disk;
  static int ignore_packed_keep_in_core;
  static int ignore_packed_keep_in_core_open;
 +static const char *stdin_packs_refs_snapshot;
  static int ignore_packed_keep_in_core_has_cruft;
  static int allow_ofs_delta;
+ static int allow_ref_delta = 1;
  static struct pack_idx_option pack_idx_opts;
  static const char *base_name;
  static int progress = 1;
Simple merge
diff --cc pack-bitmap.c
Simple merge
diff --cc pack-bitmap.h
Simple merge
Simple merge
Simple merge
Simple merge