Name make_*_path functions more accurately
Rename the make_*_path functions so it's clearer what they do, in particlar make clear what the differnce between make_absolute_path and make_nonrelative_path is by renaming them real_path and absolute_path respectively. make_relative_path has an understandable name and is renamed to relative_path to maintain the name convention. The function calls have been replaced 1-to-1 in their usage. Signed-off-by: Carlos Martín Nieto <cmn@elego.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
a3ca9b0fbe
commit
e2a57aac8a
@ -435,7 +435,7 @@ test_expect_success 'update-index D/F conflict' '
|
||||
test $numpath0 = 1
|
||||
'
|
||||
|
||||
test_expect_success SYMLINKS 'absolute path works as expected' '
|
||||
test_expect_success SYMLINKS 'real path works as expected' '
|
||||
mkdir first &&
|
||||
ln -s ../.git first/.git &&
|
||||
mkdir second &&
|
||||
@ -443,14 +443,14 @@ test_expect_success SYMLINKS 'absolute path works as expected' '
|
||||
mkdir third &&
|
||||
dir="$(cd .git; pwd -P)" &&
|
||||
dir2=third/../second/other/.git &&
|
||||
test "$dir" = "$(test-path-utils make_absolute_path $dir2)" &&
|
||||
test "$dir" = "$(test-path-utils real_path $dir2)" &&
|
||||
file="$dir"/index &&
|
||||
test "$file" = "$(test-path-utils make_absolute_path $dir2/index)" &&
|
||||
test "$file" = "$(test-path-utils real_path $dir2/index)" &&
|
||||
basename=blub &&
|
||||
test "$dir/$basename" = "$(cd .git && test-path-utils make_absolute_path "$basename")" &&
|
||||
test "$dir/$basename" = "$(cd .git && test-path-utils real_path "$basename")" &&
|
||||
ln -s ../first/file .git/syml &&
|
||||
sym="$(cd first; pwd -P)"/file &&
|
||||
test "$sym" = "$(test-path-utils make_absolute_path "$dir2/syml")"
|
||||
test "$sym" = "$(test-path-utils real_path "$dir2/syml")"
|
||||
'
|
||||
|
||||
test_expect_success 'very long name in the index handled sanely' '
|
||||
|
Reference in New Issue
Block a user