Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: git/git
base: bfa646c2cbad55cf652344415616eadc9e20f3c4
Choose a base ref
...
head repository: git/git
compare: 71ef66d7403c05a6fe8ec118431332a8919b52a2
Choose a head ref
  • 9 commits
  • 28 files changed
  • 2 contributors

Commits on Sep 23, 2021

  1. Merge branch 'jt/add-submodule-odb-clean-up' into jt/no-abuse-alterna…

    …te-odb-for-submodules
    
    * jt/add-submodule-odb-clean-up:
      revision: remove "submodule" from opt struct
      repository: support unabsorbed in repo_submodule_init
      submodule: remove unnecessary unabsorbed fallback
    gitster committed Sep 23, 2021
    Copy the full SHA
    6295f87 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2021

  1. Merge branch 'jk/ref-paranoia' into jt/no-abuse-alternate-odb-for-sub…

    …modules
    
    * jk/ref-paranoia: (71 commits)
      refs: drop "broken" flag from for_each_fullref_in()
      ref-filter: drop broken-ref code entirely
      ref-filter: stop setting FILTER_REFS_INCLUDE_BROKEN
      repack, prune: drop GIT_REF_PARANOIA settings
      refs: turn on GIT_REF_PARANOIA by default
      refs: omit dangling symrefs when using GIT_REF_PARANOIA
      refs: add DO_FOR_EACH_OMIT_DANGLING_SYMREFS flag
      refs-internal.h: reorganize DO_FOR_EACH_* flag documentation
      refs-internal.h: move DO_FOR_EACH_* flags next to each other
      t5312: be more assertive about command failure
      t5312: test non-destructive repack
      t5312: create bogus ref as necessary
      t5312: drop "verbose" helper
      t5600: provide detached HEAD for corruption failures
      t5516: don't use HEAD ref for invalid ref-deletion tests
      t7900: clean up some more broken refs
      The eighth batch
      t0000: avoid masking git exit value through pipes
      tree-diff: fix leak when not HAVE_ALLOCA_H
      pack-revindex.h: correct the time complexity descriptions
      ...
    gitster committed Sep 28, 2021
    1
    Copy the full SHA
    b6b210c View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2021

  1. refs: plumb repo into ref stores

    In preparation for the next 2 patches that adds (partial) support for
    arbitrary repositories to ref iterators, plumb a repository into all ref
    stores. There are no changes to program logic.
    
    Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jonathantanmy authored and gitster committed Oct 8, 2021
    Copy the full SHA
    34224e1 View commit details
    Browse the repository at this point in the history
  2. refs: teach arbitrary repo support to iterators

    Note that should_pack_ref() is called when writing refs, which is only
    supported for the_repository, hence the_repository is hardcoded there.
    
    Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jonathantanmy authored and gitster committed Oct 8, 2021
    Copy the full SHA
    9bc45a2 View commit details
    Browse the repository at this point in the history
  3. refs: peeling non-the_repository iterators is BUG

    There is currently no support for peeling the current ref of an iterator
    iterating over a non-the_repository ref store, and none is needed. Thus,
    for now, BUG() if that happens.
    
    Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jonathantanmy authored and gitster committed Oct 8, 2021
    Copy the full SHA
    8788195 View commit details
    Browse the repository at this point in the history
  4. merge-{ort,recursive}: remove add_submodule_odb()

    After the parent commit and some of its ancestors, the only place
    commits are being accessed through alternates is in the user-facing
    message formatting code. Fix those, and remove the add_submodule_odb()
    calls.
    
    Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jonathantanmy authored and gitster committed Oct 8, 2021
    Copy the full SHA
    155b517 View commit details
    Browse the repository at this point in the history
  5. object-file: only register submodule ODB if needed

    In a35e03d ("submodule: lazily add submodule ODBs as alternates",
    2021-09-08), Git was taught to add all known submodule ODBs as
    alternates when attempting to read an object that doesn't exist, as a
    fallback for when a submodule object is read as if it were in
    the_repository. However, this behavior wasn't restricted to happen only
    when reading from the_repository. Fix this.
    
    Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jonathantanmy authored and gitster committed Oct 8, 2021
    Copy the full SHA
    eef7190 View commit details
    Browse the repository at this point in the history
  6. submodule: pass repo to check_has_commit()

    Pass the repo explicitly when calling check_has_commit() to avoid
    relying on add_submodule_odb(). With this commit and the parent commit,
    the last remaining tests no longer rely on add_submodule_odb(), so mark
    these tests accordingly.
    
    Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jonathantanmy authored and gitster committed Oct 8, 2021
    Copy the full SHA
    13a2f62 View commit details
    Browse the repository at this point in the history
  7. submodule: trace adding submodule ODB as alternate

    Submodule ODBs are never added as alternates during the execution of the
    test suite, but there may be a rare interaction that the test suite does
    not have coverage of. Add a trace message when this happens, so that
    users who trace their commands can notice such occurrences.
    
    Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jonathantanmy authored and gitster committed Oct 8, 2021
    Copy the full SHA
    71ef66d View commit details
    Browse the repository at this point in the history