git/t/t1505-rev-parse-last.sh
Johannes Schindelin 06d531486e t[01]*: adjust the references to the default branch name "main"
Carefully excluding t1309, which sees independent development elsewhere
at the time of writing, we transition above-mentioned tests to the
default branch name `main`. This trick was performed via

	$ (cd t &&
	   sed -i -e 's/master/main/g' -e 's/MASTER/MAIN/g' \
		-e 's/Master/Main/g' -e 's/naster/nain/g' -- t[01]*.sh &&
	   git checkout HEAD -- t1309\*)

Note that t5533 contains a variation of the name `master` (`naster`)
that we rename here, too.

This allows us to define `GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main`
for those tests.

Helped-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-11-19 15:44:18 -08:00

64 lines
965 B
Bash
Executable file

#!/bin/sh
test_description='test @{-N} syntax'
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh
make_commit () {
echo "$1" > "$1" &&
git add "$1" &&
git commit -m "$1"
}
test_expect_success 'setup' '
make_commit 1 &&
git branch side &&
make_commit 2 &&
make_commit 3 &&
git checkout side &&
make_commit 4 &&
git merge main &&
git checkout main
'
# 1 -- 2 -- 3 main
# \ \
# \ \
# --- 4 --- 5 side
#
# and 'side' should be the last branch
test_expect_success '@{-1} works' '
test_cmp_rev side @{-1}
'
test_expect_success '@{-1}~2 works' '
test_cmp_rev side~2 @{-1}~2
'
test_expect_success '@{-1}^2 works' '
test_cmp_rev side^2 @{-1}^2
'
test_expect_success '@{-1}@{1} works' '
test_cmp_rev side@{1} @{-1}@{1}
'
test_expect_success '@{-2} works' '
test_cmp_rev main @{-2}
'
test_expect_success '@{-3} fails' '
test_must_fail git rev-parse @{-3}
'
test_done