Merge branch 'jk/peel-iterated-oid'

The peel_ref() API has been replaced with peel_iterated_oid().

* jk/peel-iterated-oid:
  refs: switch peel_ref() to peel_iterated_oid()

diff --cc builtin/gc.c
Simple merge

diff --cc builtin/pack-objects.c
Simple merge

diff --cc commit-graph.c
Simple merge

diff --cc refs.c
Simple merge

diff --cc t/t1405-main-ref-store.sh
index 602e21957b5aa87854f73bedaddf2e8c4221181c,5f69ef8519b8b127a309eccb0c971d944be668ba..a237d9880ead84fac4e36c1a34082452d06f0fff
--- 1/t/t1405-main-ref-store.sh
--- 2/t/t1405-main-ref-store.sh
+++ b/t/t1405-main-ref-store.sh
@@@ -17,24 -14,18 +17,18 @@@ test_expect_success 'pack_refs(PACK_REF
        N=`find .git/refs -type f | wc -l`
  '
  
- test_expect_success 'peel_ref(new-tag)' '
-       git rev-parse HEAD >expected &&
-       git tag -a -m new-tag new-tag HEAD &&
-       $RUN peel-ref refs/tags/new-tag >actual &&
-       test_cmp expected actual
- '
- 
 -test_expect_success 'create_symref(FOO, refs/heads/master)' '
 -      $RUN create-symref FOO refs/heads/master nothing &&
 -      echo refs/heads/master >expected &&
 +test_expect_success 'create_symref(FOO, refs/heads/main)' '
 +      $RUN create-symref FOO refs/heads/main nothing &&
 +      echo refs/heads/main >expected &&
        git symbolic-ref FOO >actual &&
        test_cmp expected actual
  '
  
  test_expect_success 'delete_refs(FOO, refs/tags/new-tag)' '
+       git tag -a -m new-tag new-tag HEAD &&
        git rev-parse FOO -- &&
        git rev-parse refs/tags/new-tag -- &&
 -      m=$(git rev-parse master) &&
 +      m=$(git rev-parse main) &&
        REF_NO_DEREF=1 &&
        $RUN delete-refs $REF_NO_DEREF nothing FOO refs/tags/new-tag &&
        test_must_fail git rev-parse --symbolic-full-name FOO &&

diff --cc t/t1406-submodule-ref-store.sh
index a68c8f11a24664b9995b12d4f75073ba5eabb4aa,110ac40a988a2eb4be37d7bcb6c18fa75a60e193..0a87058971ee3f601f928a1d3078c25ac0a60ce2
--- 1/t/t1406-submodule-ref-store.sh
--- 2/t/t1406-submodule-ref-store.sh
+++ b/t/t1406-submodule-ref-store.sh
@@@ -14,7 -11,8 +14,8 @@@ test_expect_success 'setup' 
        (
                cd sub &&
                test_commit first &&
-               git checkout -b new-main
 -              git checkout -b new-master &&
++              git checkout -b new-main &&
+               git tag -a -m new-tag new-tag HEAD
        )
  '
  
@@@ -22,15 -20,8 +23,8 @@@ test_expect_success 'pack_refs() not al
        test_must_fail $RUN pack-refs 3
  '
  
- test_expect_success 'peel_ref(new-tag)' '
-       git -C sub rev-parse HEAD >expected &&
-       git -C sub tag -a -m new-tag new-tag HEAD &&
-       $RUN peel-ref refs/tags/new-tag >actual &&
-       test_cmp expected actual
- '
- 
  test_expect_success 'create_symref() not allowed' '
 -      test_must_fail $RUN create-symref FOO refs/heads/master nothing
 +      test_must_fail $RUN create-symref FOO refs/heads/main nothing
  '
  
  test_expect_success 'delete_refs() not allowed' '