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

subtree: t7900: use consistent formatting

Browse Source 
The formatting in t7900-subtree.sh isn't even consistent throughout the
file.  Fix that; make it consistent throughout the file.

Signed-off-by: Luke Shumaker <lukeshu@datawire.io>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Luke Shumaker
2021-04-27 15:17:22 -06:00
committed by Junio C Hamano
parent f2bb7fef7a
commit f700406957
1 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
contrib/subtree/t/t7900-subtree.sh
View File

@ -11,11 +11,9 @@ and split subcommands of git subtree.
TEST_DIRECTORY=$(pwd)/../../../t TEST_DIRECTORY=$(pwd)/../../../t
export TEST_DIRECTORY export TEST_DIRECTORY
. "$TEST_DIRECTORY"/test-lib.sh
. ../../../t/test-lib.sh subtree_test_create_repo () {
subtree_test_create_repo()
{
test_create_repo "$1" && test_create_repo "$1" &&
( (
cd "$1" && cd "$1" &&
@ -23,26 +21,24 @@ subtree_test_create_repo()
) )
} }
create() create () {
{
echo "$1" >"$1" && echo "$1" >"$1" &&
git add "$1" git add "$1"
} }
check_equal() check_equal () {
{
test_debug 'echo' test_debug 'echo'
test_debug "echo \"check a:\" \"{$1}\"" test_debug "echo \"check a:\" \"{$1}\""
test_debug "echo \" b:\" \"{$2}\"" test_debug "echo \" b:\" \"{$2}\""
if [ "$1" = "$2" ]; then if test "$1" = "$2"
then
return 0 return 0
else else
return 1 return 1
fi fi
} }
undo() undo () {
{
git reset --hard HEAD~ git reset --hard HEAD~
} }
@ -50,15 +46,18 @@ undo()
# The original set of commits changed only one file each. # The original set of commits changed only one file each.
# A multi-file change would imply that we pruned commits # A multi-file change would imply that we pruned commits
# too aggressively. # too aggressively.
join_commits() join_commits () {
{
commit= commit=
all= all=
while read x y; do while read x y
if [ -z "$x" ]; then do
if test -z "$x"
then
continue continue
elif [ "$x" = "commit:" ]; then elif test "$x" = "commit:"
if [ -n "$commit" ]; then then
if test -n "$commit"
then
echo "$commit $all" echo "$commit $all"
all= all=
fi fi
@ -81,8 +80,7 @@ test_create_commit() (
git commit -m "$commit" || error "Could not commit" git commit -m "$commit" || error "Could not commit"
) )
last_commit_message() last_commit_message () {
{
git log --pretty=format:%s -1 git log --pretty=format:%s -1
} }
@ -111,7 +109,8 @@ test_expect_success 'no pull from non-existent subtree' '
cd "$test_count" && cd "$test_count" &&
git fetch ./"sub proj" HEAD && git fetch ./"sub proj" HEAD &&
test_must_fail git subtree pull --prefix="sub dir" ./"sub proj" HEAD test_must_fail git subtree pull --prefix="sub dir" ./"sub proj" HEAD
)' )
'
test_expect_success 'add subproj as subtree into sub dir/ with --prefix' ' test_expect_success 'add subproj as subtree into sub dir/ with --prefix' '
subtree_test_create_repo "$test_count" && subtree_test_create_repo "$test_count" &&
@ -893,7 +892,8 @@ test_expect_success 'verify one file change per commit' '
x= && x= &&
git log --pretty=format:"commit: %H" | join_commits | git log --pretty=format:"commit: %H" | join_commits |
( (
while read commit a b; do while read commit a b
do
test_debug "echo Verifying commit $commit" test_debug "echo Verifying commit $commit"
test_debug "echo a: $a" test_debug "echo a: $a"
test_debug "echo b: $b" test_debug "echo b: $b"