subtree: t7900: use 'test' for string equality
t7900-subtree.sh defines its own `check_equal A B` function, instead of just using `test A = B` like all of the other tests. Don't be special, get rid of `check_equal` in favor of `test`. 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
40b1e1ec58
commit
c4566ab429
@ -28,18 +28,6 @@ create () {
|
||||
git add "$1"
|
||||
}
|
||||
|
||||
check_equal () {
|
||||
test_debug 'echo'
|
||||
test_debug "echo \"check a:\" \"{$1}\""
|
||||
test_debug "echo \" b:\" \"{$2}\""
|
||||
if test "$1" = "$2"
|
||||
then
|
||||
return 0
|
||||
else
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
undo () {
|
||||
git reset --hard HEAD~
|
||||
}
|
||||
@ -123,7 +111,7 @@ test_expect_success 'add subproj as subtree into sub dir/ with --prefix' '
|
||||
cd "$test_count" &&
|
||||
git fetch ./"sub proj" HEAD &&
|
||||
git subtree add --prefix="sub dir" FETCH_HEAD &&
|
||||
check_equal "$(last_commit_message)" "Add '\''sub dir/'\'' from commit '\''$(git rev-parse FETCH_HEAD)'\''"
|
||||
test "$(last_commit_message)" = "Add '\''sub dir/'\'' from commit '\''$(git rev-parse FETCH_HEAD)'\''"
|
||||
)
|
||||
'
|
||||
|
||||
@ -136,7 +124,7 @@ test_expect_success 'add subproj as subtree into sub dir/ with --prefix and --me
|
||||
cd "$test_count" &&
|
||||
git fetch ./"sub proj" HEAD &&
|
||||
git subtree add --prefix="sub dir" --message="Added subproject" FETCH_HEAD &&
|
||||
check_equal "$(last_commit_message)" "Added subproject"
|
||||
test "$(last_commit_message)" = "Added subproject"
|
||||
)
|
||||
'
|
||||
|
||||
@ -149,7 +137,7 @@ test_expect_success 'add subproj as subtree into sub dir/ with --prefix as -P an
|
||||
cd "$test_count" &&
|
||||
git fetch ./"sub proj" HEAD &&
|
||||
git subtree add -P "sub dir" -m "Added subproject" FETCH_HEAD &&
|
||||
check_equal "$(last_commit_message)" "Added subproject"
|
||||
test "$(last_commit_message)" = "Added subproject"
|
||||
)
|
||||
'
|
||||
|
||||
@ -162,7 +150,7 @@ test_expect_success 'add subproj as subtree into sub dir/ with --squash and --pr
|
||||
cd "$test_count" &&
|
||||
git fetch ./"sub proj" HEAD &&
|
||||
git subtree add --prefix="sub dir" --message="Added subproject with squash" --squash FETCH_HEAD &&
|
||||
check_equal "$(last_commit_message)" "Added subproject with squash"
|
||||
test "$(last_commit_message)" = "Added subproject with squash"
|
||||
)
|
||||
'
|
||||
|
||||
@ -185,7 +173,7 @@ test_expect_success 'merge new subproj history into sub dir/ with --prefix' '
|
||||
cd "$test_count" &&
|
||||
git fetch ./"sub proj" HEAD &&
|
||||
git subtree merge --prefix="sub dir" FETCH_HEAD &&
|
||||
check_equal "$(last_commit_message)" "Merge commit '\''$(git rev-parse FETCH_HEAD)'\''"
|
||||
test "$(last_commit_message)" = "Merge commit '\''$(git rev-parse FETCH_HEAD)'\''"
|
||||
)
|
||||
'
|
||||
|
||||
@ -204,7 +192,7 @@ test_expect_success 'merge new subproj history into sub dir/ with --prefix and -
|
||||
cd "$test_count" &&
|
||||
git fetch ./"sub proj" HEAD &&
|
||||
git subtree merge --prefix="sub dir" --message="Merged changes from subproject" FETCH_HEAD &&
|
||||
check_equal "$(last_commit_message)" "Merged changes from subproject"
|
||||
test "$(last_commit_message)" = "Merged changes from subproject"
|
||||
)
|
||||
'
|
||||
|
||||
@ -223,7 +211,7 @@ test_expect_success 'merge new subproj history into sub dir/ with --squash and -
|
||||
cd "$test_count" &&
|
||||
git fetch ./"sub proj" HEAD &&
|
||||
git subtree merge --prefix="sub dir" --message="Merged changes from subproject using squash" --squash FETCH_HEAD &&
|
||||
check_equal "$(last_commit_message)" "Merged changes from subproject using squash"
|
||||
test "$(last_commit_message)" = "Merged changes from subproject using squash"
|
||||
)
|
||||
'
|
||||
|
||||
@ -239,7 +227,7 @@ test_expect_success 'merge the added subproj again, should do nothing' '
|
||||
# this shouldn not actually do anything, since FETCH_HEAD
|
||||
# is already a parent
|
||||
result=$(git merge -s ours -m "merge -s -ours" FETCH_HEAD) &&
|
||||
check_equal "${result}" "Already up to date."
|
||||
test "${result}" = "Already up to date."
|
||||
)
|
||||
'
|
||||
|
||||
@ -258,7 +246,7 @@ test_expect_success 'merge new subproj history into subdir/ with a slash appende
|
||||
cd "$test_count" &&
|
||||
git fetch ./subproj HEAD &&
|
||||
git subtree merge --prefix=subdir/ FETCH_HEAD &&
|
||||
check_equal "$(last_commit_message)" "Merge commit '\''$(git rev-parse FETCH_HEAD)'\''"
|
||||
test "$(last_commit_message)" = "Merge commit '\''$(git rev-parse FETCH_HEAD)'\''"
|
||||
)
|
||||
'
|
||||
|
||||
@ -324,7 +312,7 @@ test_expect_success 'split sub dir/ with --rejoin' '
|
||||
git subtree merge --prefix="sub dir" FETCH_HEAD &&
|
||||
split_hash=$(git subtree split --prefix="sub dir" --annotate="*") &&
|
||||
git subtree split --prefix="sub dir" --annotate="*" --rejoin &&
|
||||
check_equal "$(last_commit_message)" "Split '\''sub dir/'\'' into commit '\''$split_hash'\''"
|
||||
test "$(last_commit_message)" = "Split '\''sub dir/'\'' into commit '\''$split_hash'\''"
|
||||
)
|
||||
'
|
||||
|
||||
@ -339,7 +327,7 @@ test_expect_success 'split sub dir/ with --rejoin from scratch' '
|
||||
git commit -m"sub dir file" &&
|
||||
split_hash=$(git subtree split --prefix="sub dir" --rejoin) &&
|
||||
git subtree split --prefix="sub dir" --rejoin &&
|
||||
check_equal "$(last_commit_message)" "Split '\''sub dir/'\'' into commit '\''$split_hash'\''"
|
||||
test "$(last_commit_message)" = "Split '\''sub dir/'\'' into commit '\''$split_hash'\''"
|
||||
)
|
||||
'
|
||||
|
||||
@ -362,7 +350,7 @@ test_expect_success 'split sub dir/ with --rejoin and --message' '
|
||||
git fetch ./"sub proj" HEAD &&
|
||||
git subtree merge --prefix="sub dir" FETCH_HEAD &&
|
||||
git subtree split --prefix="sub dir" --message="Split & rejoin" --annotate="*" --rejoin &&
|
||||
check_equal "$(last_commit_message)" "Split & rejoin"
|
||||
test "$(last_commit_message)" = "Split & rejoin"
|
||||
)
|
||||
'
|
||||
|
||||
@ -386,7 +374,7 @@ test_expect_success 'split "sub dir"/ with --branch' '
|
||||
git subtree merge --prefix="sub dir" FETCH_HEAD &&
|
||||
split_hash=$(git subtree split --prefix="sub dir" --annotate="*") &&
|
||||
git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br &&
|
||||
check_equal "$(git rev-parse subproj-br)" "$split_hash"
|
||||
test "$(git rev-parse subproj-br)" = "$split_hash"
|
||||
)
|
||||
'
|
||||
|
||||
@ -410,13 +398,13 @@ test_expect_success 'check hash of split' '
|
||||
git subtree merge --prefix="sub dir" FETCH_HEAD &&
|
||||
split_hash=$(git subtree split --prefix="sub dir" --annotate="*") &&
|
||||
git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br &&
|
||||
check_equal "$(git rev-parse subproj-br)" "$split_hash" &&
|
||||
test "$(git rev-parse subproj-br)" = "$split_hash" &&
|
||||
# Check hash of split
|
||||
new_hash=$(git rev-parse subproj-br^2) &&
|
||||
(
|
||||
cd ./"sub proj" &&
|
||||
subdir_hash=$(git rev-parse HEAD) &&
|
||||
check_equal ''"$new_hash"'' "$subdir_hash"
|
||||
test ''"$new_hash"'' = "$subdir_hash"
|
||||
)
|
||||
)
|
||||
'
|
||||
@ -442,7 +430,7 @@ test_expect_success 'split "sub dir"/ with --branch for an existing branch' '
|
||||
git subtree merge --prefix="sub dir" FETCH_HEAD &&
|
||||
split_hash=$(git subtree split --prefix="sub dir" --annotate="*") &&
|
||||
git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br &&
|
||||
check_equal "$(git rev-parse subproj-br)" "$split_hash"
|
||||
test "$(git rev-parse subproj-br)" = "$split_hash"
|
||||
)
|
||||
'
|
||||
|
||||
@ -740,7 +728,7 @@ test_expect_success 'make sure the --rejoin commits never make it into subproj'
|
||||
(
|
||||
cd "$test_count" &&
|
||||
git subtree pull --prefix="sub dir" ./"sub proj" HEAD &&
|
||||
check_equal "$(git log --pretty=format:"%s" HEAD^2 | grep -i split)" ""
|
||||
test "$(git log --pretty=format:"%s" HEAD^2 | grep -i split)" = ""
|
||||
)
|
||||
'
|
||||
|
||||
@ -791,7 +779,7 @@ test_expect_success 'make sure no "git subtree" tagged commits make it into subp
|
||||
git subtree pull --prefix="sub dir" ./"sub proj" HEAD &&
|
||||
|
||||
# They are meaningless to subproj since one side of the merge refers to the mainline
|
||||
check_equal "$(git log --pretty=format:"%s%n%b" HEAD^2 | grep "git-subtree.*:")" ""
|
||||
test "$(git log --pretty=format:"%s%n%b" HEAD^2 | grep "git-subtree.*:")" = ""
|
||||
)
|
||||
'
|
||||
|
||||
@ -825,7 +813,7 @@ test_expect_success 'make sure "git subtree split" find the correct parent' '
|
||||
# not, something went wrong (the "newparent" of "HEAD~" commit should
|
||||
# have been sub2, but it was not, because its cache was not set to
|
||||
# itself)
|
||||
check_equal "$(git log --pretty=format:%P -1 subproj-br)" "$(git rev-parse subproj-ref)"
|
||||
test "$(git log --pretty=format:%P -1 subproj-br)" = "$(git rev-parse subproj-ref)"
|
||||
)
|
||||
'
|
||||
|
||||
@ -859,7 +847,7 @@ test_expect_success 'split a new subtree without --onto option' '
|
||||
# if the parent of the first commit in the tree is not empty,
|
||||
# then the new subtree has accidentally been attached to something
|
||||
git subtree split --prefix="sub dir2" --branch subproj2-br &&
|
||||
check_equal "$(git log --pretty=format:%P -1 subproj2-br)" ""
|
||||
test "$(git log --pretty=format:%P -1 subproj2-br)" = ""
|
||||
)
|
||||
'
|
||||
|
||||
@ -899,10 +887,10 @@ test_expect_success 'verify one file change per commit' '
|
||||
test_debug "echo Verifying commit $commit"
|
||||
test_debug "echo a: $a"
|
||||
test_debug "echo b: $b"
|
||||
check_equal "$b" ""
|
||||
test "$b" = ""
|
||||
x=1
|
||||
done
|
||||
check_equal "$x" 1
|
||||
test "$x" = 1
|
||||
)
|
||||
)
|
||||
'
|
||||
@ -934,7 +922,7 @@ test_expect_success 'push split to subproj' '
|
||||
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"
|
||||
test "$(last_commit_message)" = "sub dir/main-sub3"
|
||||
)
|
||||
'
|
||||
|
||||
@ -994,7 +982,7 @@ test_expect_success 'subtree descendant check' '
|
||||
|
||||
git subtree split --prefix folder_subtree/ --branch subtree_tip $defaultBranch &&
|
||||
git subtree split --prefix folder_subtree/ --branch subtree_branch branch &&
|
||||
check_equal $(git rev-list --count subtree_tip..subtree_branch) 0
|
||||
test $(git rev-list --count subtree_tip..subtree_branch) = 0
|
||||
)
|
||||
'
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user