mirror of
https://github.com/git/git
synced 2024-08-26 19:19:18 +00:00
subtree: t7900: use consistent formatting
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
Junio C Hamano
parent
f2bb7fef7a
commit
f700406957
|
|
@ -11,11 +11,9 @@ and split subcommands of git subtree.
|
|||
|
||||
TEST_DIRECTORY=$(pwd)/../../../t
|
||||
export TEST_DIRECTORY
|
||||
. "$TEST_DIRECTORY"/test-lib.sh
|
||||
|
||||
. ../../../t/test-lib.sh
|
||||
|
||||
subtree_test_create_repo()
|
||||
{
|
||||
subtree_test_create_repo () {
|
||||
test_create_repo "$1" &&
|
||||
(
|
||||
cd "$1" &&
|
||||
|
|
@ -23,26 +21,24 @@ subtree_test_create_repo()
|
|||
)
|
||||
}
|
||||
|
||||
create()
|
||||
{
|
||||
create () {
|
||||
echo "$1" >"$1" &&
|
||||
git add "$1"
|
||||
}
|
||||
|
||||
check_equal()
|
||||
{
|
||||
check_equal () {
|
||||
test_debug 'echo'
|
||||
test_debug "echo \"check a:\" \"{$1}\""
|
||||
test_debug "echo \" b:\" \"{$2}\""
|
||||
if [ "$1" = "$2" ]; then
|
||||
if test "$1" = "$2"
|
||||
then
|
||||
return 0
|
||||
else
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
undo()
|
||||
{
|
||||
undo () {
|
||||
git reset --hard HEAD~
|
||||
}
|
||||
|
||||
|
|
@ -50,15 +46,18 @@ undo()
|
|||
# The original set of commits changed only one file each.
|
||||
# A multi-file change would imply that we pruned commits
|
||||
# too aggressively.
|
||||
join_commits()
|
||||
{
|
||||
join_commits () {
|
||||
commit=
|
||||
all=
|
||||
while read x y; do
|
||||
if [ -z "$x" ]; then
|
||||
while read x y
|
||||
do
|
||||
if test -z "$x"
|
||||
then
|
||||
continue
|
||||
elif [ "$x" = "commit:" ]; then
|
||||
if [ -n "$commit" ]; then
|
||||
elif test "$x" = "commit:"
|
||||
then
|
||||
if test -n "$commit"
|
||||
then
|
||||
echo "$commit $all"
|
||||
all=
|
||||
fi
|
||||
|
|
@ -70,7 +69,7 @@ join_commits()
|
|||
echo "$commit $all"
|
||||
}
|
||||
|
||||
test_create_commit() (
|
||||
test_create_commit () (
|
||||
repo=$1 &&
|
||||
commit=$2 &&
|
||||
cd "$repo" &&
|
||||
|
|
@ -81,8 +80,7 @@ test_create_commit() (
|
|||
git commit -m "$commit" || error "Could not commit"
|
||||
)
|
||||
|
||||
last_commit_message()
|
||||
{
|
||||
last_commit_message () {
|
||||
git log --pretty=format:%s -1
|
||||
}
|
||||
|
||||
|
|
@ -111,7 +109,8 @@ test_expect_success 'no pull from non-existent subtree' '
|
|||
cd "$test_count" &&
|
||||
git fetch ./"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' '
|
||||
subtree_test_create_repo "$test_count" &&
|
||||
|
|
@ -274,8 +273,8 @@ test_expect_success 'split requires option --prefix' '
|
|||
cd "$test_count" &&
|
||||
git fetch ./"sub proj" HEAD &&
|
||||
git subtree add --prefix="sub dir" FETCH_HEAD &&
|
||||
echo "You must provide the --prefix option." > expected &&
|
||||
test_must_fail git subtree split > actual 2>&1 &&
|
||||
echo "You must provide the --prefix option." >expected &&
|
||||
test_must_fail git subtree split >actual 2>&1 &&
|
||||
test_debug "printf '"expected: "'" &&
|
||||
test_debug "cat expected" &&
|
||||
test_debug "printf '"actual: "'" &&
|
||||
|
|
@ -293,8 +292,8 @@ test_expect_success 'split requires path given by option --prefix must exist' '
|
|||
cd "$test_count" &&
|
||||
git fetch ./"sub proj" HEAD &&
|
||||
git subtree add --prefix="sub dir" FETCH_HEAD &&
|
||||
echo "'\''non-existent-directory'\'' does not exist; use '\''git subtree add'\''" > expected &&
|
||||
test_must_fail git subtree split --prefix=non-existent-directory > actual 2>&1 &&
|
||||
echo "'\''non-existent-directory'\'' does not exist; use '\''git subtree add'\''" >expected &&
|
||||
test_must_fail git subtree split --prefix=non-existent-directory >actual 2>&1 &&
|
||||
test_debug "printf '"expected: "'" &&
|
||||
test_debug "cat expected" &&
|
||||
test_debug "printf '"actual: "'" &&
|
||||
|
|
@ -325,7 +324,7 @@ test_expect_success 'split sub dir/ with --rejoin' '
|
|||
git subtree split --prefix="sub dir" --annotate="*" --rejoin &&
|
||||
check_equal "$(last_commit_message)" "Split '\''sub dir/'\'' into commit '\''$split_hash'\''"
|
||||
)
|
||||
'
|
||||
'
|
||||
|
||||
test_expect_success 'split sub dir/ with --rejoin from scratch' '
|
||||
subtree_test_create_repo "$test_count" &&
|
||||
|
|
@ -340,7 +339,7 @@ test_expect_success 'split sub dir/ with --rejoin from scratch' '
|
|||
git subtree split --prefix="sub dir" --rejoin &&
|
||||
check_equal "$(last_commit_message)" "Split '\''sub dir/'\'' into commit '\''$split_hash'\''"
|
||||
)
|
||||
'
|
||||
'
|
||||
|
||||
test_expect_success 'split sub dir/ with --rejoin and --message' '
|
||||
subtree_test_create_repo "$test_count" &&
|
||||
|
|
@ -893,7 +892,8 @@ test_expect_success 'verify one file change per commit' '
|
|||
x= &&
|
||||
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 a: $a"
|
||||
test_debug "echo b: $b"
|
||||
|
|
@ -921,18 +921,18 @@ test_expect_success 'push split to subproj' '
|
|||
test_create_commit "$test_count" "sub dir"/main-sub2 &&
|
||||
(
|
||||
cd $test_count/"sub proj" &&
|
||||
git branch sub-branch-1 &&
|
||||
cd .. &&
|
||||
git branch sub-branch-1 &&
|
||||
cd .. &&
|
||||
git fetch ./"sub proj" HEAD &&
|
||||
git subtree merge --prefix="sub dir" FETCH_HEAD
|
||||
) &&
|
||||
test_create_commit "$test_count" "sub dir"/main-sub3 &&
|
||||
(
|
||||
(
|
||||
cd "$test_count" &&
|
||||
git subtree push ./"sub proj" --prefix "sub dir" sub-branch-1 &&
|
||||
cd ./"sub proj" &&
|
||||
git checkout sub-branch-1 &&
|
||||
check_equal "$(last_commit_message)" "sub dir/main-sub3"
|
||||
git subtree push ./"sub proj" --prefix "sub dir" sub-branch-1 &&
|
||||
cd ./"sub proj" &&
|
||||
git checkout sub-branch-1 &&
|
||||
check_equal "$(last_commit_message)" "sub dir/main-sub3"
|
||||
)
|
||||
'
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue