mbox series

[v3,0/2] When fetching, die if in commit graph but not obj db

Message ID cover.1730833754.git.jonathantanmy@google.com (mailing list archive)
Headers show
Series When fetching, die if in commit graph but not obj db | expand

Message

Jonathan Tan Nov. 5, 2024, 7:24 p.m. UTC
Changes: the commit message title of the second patch, and a change from
grep to test_grep.

Jonathan Tan (2):
  Revert "fetch-pack: add a deref_without_lazy_fetch_extended()"
  fetch-pack: die if in commit graph but not obj db

 fetch-pack.c                               | 42 +++++++++++-----------
 t/t5330-no-lazy-fetch-with-commit-graph.sh |  4 +--
 2 files changed, 24 insertions(+), 22 deletions(-)

Range-diff against v2:
1:  34e87b8388 = 1:  34e87b8388 Revert "fetch-pack: add a deref_without_lazy_fetch_extended()"
2:  a35e386a0e ! 2:  c92b2c9e50 fetch-pack: warn if in commit graph but not obj db
    @@ Metadata
     Author: Jonathan Tan <jonathantanmy@google.com>
     
      ## Commit message ##
    -    fetch-pack: warn if in commit graph but not obj db
    +    fetch-pack: die if in commit graph but not obj db
     
         When fetching, there is a step in which sought objects are first checked
         against the local repository; only objects that are not in the local
    @@ t/t5330-no-lazy-fetch-with-commit-graph.sh: test_expect_success 'fetch any commi
     -	GIT_TRACE="$(pwd)/trace.txt" \
     +	test_must_fail env GIT_TRACE="$(pwd)/trace.txt" \
      		git -C with-commit-graph fetch origin $anycommit 2>err &&
    - 	! grep "fatal: promisor-remote: unable to fork off fetch subprocess" err &&
    +-	! grep "fatal: promisor-remote: unable to fork off fetch subprocess" err &&
    ++	test_grep ! "fatal: promisor-remote: unable to fork off fetch subprocess" err &&
      	grep "git fetch origin" trace.txt >actual &&
    + 	test_line_count = 1 actual
    + '

Comments

Junio C Hamano Nov. 6, 2024, 3:12 a.m. UTC | #1
Jonathan Tan <jonathantanmy@google.com> writes:

> Changes: the commit message title of the second patch, and a change from
> grep to test_grep.
>
> Jonathan Tan (2):
>   Revert "fetch-pack: add a deref_without_lazy_fetch_extended()"
>   fetch-pack: die if in commit graph but not obj db

I presume that with this the topic should be ready for 'next'.

Thanks.