mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t2018: replace "sha" with "oid"

Browse Source 
As part of the effort to become more hash-agnostic, replace all
instances of "sha" with "oid".

Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Denton Liu
2020-01-06 23:53:04 -05:00
committed by Junio C Hamano
parent 62e80fcb48
commit 4a6f11fd7b
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
t/t2018-checkout-branch.sh
View File

@ -4,12 +4,12 @@ test_description='checkout'
. ./test-lib.sh . ./test-lib.sh
# Arguments: [!] <branch> <sha> [<checkout options>] # Arguments: [!] <branch> <oid> [<checkout options>]
# #
# Runs "git checkout" to switch to <branch>, testing that # Runs "git checkout" to switch to <branch>, testing that
# #
# 1) we are on the specified branch, <branch>; # 1) we are on the specified branch, <branch>;
# 2) HEAD is <sha>; if <sha> is not specified, the old HEAD is used. # 2) HEAD is <oid>; if <oid> is not specified, the old HEAD is used.
# #
# If <checkout options> is not specified, "git checkout" is run with -b. # If <checkout options> is not specified, "git checkout" is run with -b.
# #
@ -25,8 +25,8 @@ do_checkout () {
exp_branch=$1 && exp_branch=$1 &&
exp_ref="refs/heads/$exp_branch" && exp_ref="refs/heads/$exp_branch" &&
# if <sha> is not specified, use HEAD. # if <oid> is not specified, use HEAD.
exp_sha=${2:-$(git rev-parse --verify HEAD)} && exp_oid=${2:-$(git rev-parse --verify HEAD)} &&
# default options for git checkout: -b # default options for git checkout: -b
if test -z "$3" if test -z "$3"
@ -38,15 +38,15 @@ do_checkout () {
if test -n "$should_fail" if test -n "$should_fail"
then then
test_must_fail git checkout $opts $exp_branch $exp_sha test_must_fail git checkout $opts $exp_branch $exp_oid
else else
git checkout $opts $exp_branch $exp_sha && git checkout $opts $exp_branch $exp_oid &&
echo "$exp_ref" >ref.expect && echo "$exp_ref" >ref.expect &&
git rev-parse --symbolic-full-name HEAD >ref.actual && git rev-parse --symbolic-full-name HEAD >ref.actual &&
test_cmp ref.expect ref.actual && test_cmp ref.expect ref.actual &&
echo "$exp_sha" >sha.expect && echo "$exp_oid" >oid.expect &&
git rev-parse --verify HEAD >sha.actual && git rev-parse --verify HEAD >oid.actual &&
test_cmp sha.expect sha.actual test_cmp oid.expect oid.actual
fi fi
} }