From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Feb 2021 23:04:49 +0000 (-0800)
Subject: Merge branch 'jk/peel-iterated-oid'
X-Git-Tag: v2.31.0-rc0~87
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=973e20b83f38d0a640d4e0478ddbd50dfa98daf1;p=thirdparty%2Fgit.git

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()
---

973e20b83f38d0a640d4e0478ddbd50dfa98daf1
diff --cc t/t1405-main-ref-store.sh
index 602e21957b,5f69ef8519..a237d9880e
--- a/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 a68c8f11a2,110ac40a98..0a87058971
--- a/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' '