path: root/contrib/subtree/t/t7900-subtree.sh

#!/bin/sh
#
# Copyright (c) 2012 Avery Pennaraum
# Copyright (c) 2015 Alexey Shumkin
#
test_description='Basic porcelain support for subtrees

This test verifies the basic operation of the add, pull, merge
and split subcommands of git subtree.
'

TEST_DIRECTORY=$(pwd)/../../../t
export TEST_DIRECTORY

. ../../../t/test-lib.sh

create()
{
	echo "$1" >"$1"
	git add "$1"
}

check_equal()
{
	test_debug 'echo'
	test_debug "echo \"check a:\" \"{$1}\""
	test_debug "echo \"      b:\" \"{$2}\""
	if [ "$1" = "$2" ]; then
		return 0
	else
		return 1
	fi
}

undo()
{
	git reset --hard HEAD~
}

# Make sure no patch changes more than one file.
# The original set of commits changed only one file each.
# A multi-file change would imply that we pruned commits
# too aggressively.
join_commits()
{
	commit=
	all=
	while read x y; do
		if [ -z "$x" ]; then
			continue
		elif [ "$x" = "commit:" ]; then
			if [ -n "$commit" ]; then
				echo "$commit $all"
				all=
			fi
			commit="$y"
		else
			all="$all $y"
		fi
	done
	echo "$commit $all"
}

last_commit_message()
{
	git log --pretty=format:%s -1
}

test_expect_success 'init subproj' '
	test_create_repo "sub proj"
'

# To the subproject!
cd ./"sub proj"

test_expect_success 'add sub1' '
	create sub1 &&
	git commit -m "sub1" &&
	git branch sub1 &&
	git branch -m master subproj
'

# Save this hash for testing later.

subdir_hash=$(git rev-parse HEAD)

test_expect_success 'add sub2' '
	create sub2 &&
	git commit -m "sub2" &&
	git branch sub2
'

test_expect_success 'add sub3' '
	create sub3 &&
	git commit -m "sub3" &&
	git branch sub3
'

# Back to mainline
cd ..

test_expect_success 'enable log.date=relative to catch errors' '
	git config log.date relative
'

test_expect_success 'add main4' '
	create main4 &&
	git commit -m "main4" &&
	git branch -m master mainline &&
	git branch subdir
'

test_expect_success 'fetch subproj history' '
	git fetch ./"sub proj" sub1 &&
	git branch sub1 FETCH_HEAD
'

test_expect_success 'no subtree exists in main tree' '
	test_must_fail git subtree merge --prefix="sub dir" sub1
'

test_expect_success 'no pull from non-existant subtree' '
	test_must_fail git subtree pull --prefix="sub dir" ./"sub proj" sub1
'

test_expect_success 'no merge from non-existent subtree' '
	test_must_fail git subtree merge --prefix="sub dir" FETCH_HEAD
'

test_expect_success 'add subproj as subtree into sub dir/ with --prefix' '
	git subtree add --prefix="sub dir" sub1 &&
	check_equal "$(last_commit_message)" "Add '\''sub dir/'\'' from commit '\''$(git rev-parse sub1)'\''" &&
	undo
'

test_expect_success 'check if --message works for add' '
	git subtree add --prefix="sub dir" --message="Added subproject" sub1 &&
	check_equal ''"$(last_commit_message)"'' "Added subproject" &&
	undo
'

test_expect_success 'add subproj as subtree into sub dir/ with --prefix and --message' '
	git subtree add --prefix="sub dir" --message="Added subproject" sub1 &&
	check_equal "$(last_commit_message)" "Added subproject" &&
	undo
'

test_expect_success 'check if --message works as -m and --prefix as -P' '
	git subtree add -P "sub dir" -m "Added subproject using git subtree" sub1 &&
	check_equal ''"$(last_commit_message)"'' "Added subproject using git subtree" &&
	undo
'

test_expect_success 'check if --message works with squash too' '
	git subtree add -P "sub dir" -m "Added subproject with squash" --squash sub1 &&
	check_equal ''"$(last_commit_message)"'' "Added subproject with squash" &&
	undo
'

test_expect_success 'add subproj as subtree into sub dir/ with --squash and --prefix and --message' '
	git subtree add --prefix="sub dir" --message="Added subproject with squash" --squash sub1 &&
	check_equal "$(last_commit_message)" "Added subproject with squash" &&
	undo
'

# Maybe delete
test_expect_success 'add subproj to mainline' '
	git subtree add --prefix="sub dir"/ FETCH_HEAD &&
	check_equal ''"$(last_commit_message)"'' "Add '"'sub dir/'"' from commit '"'"'''"$(git rev-parse sub1)"'''"'"'"
'

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_expect_success 'add main-sub5' '
	create "sub dir/main-sub5" &&
	git commit -m "main-sub5"
'

test_expect_success 'add main6' '
	create main6 &&
	git commit -m "main6 boring"
'

test_expect_success 'add main-sub7' '
	create "sub dir/main-sub7" &&
	git commit -m "main-sub7"
'

test_expect_success 'fetch new subproj history' '
	git fetch ./"sub proj" sub2 &&
	git branch sub2 FETCH_HEAD
'

test_expect_success 'check if --message works for merge' '
	git subtree merge --prefix="sub dir" -m "Merged changes from subproject" sub2 &&
	check_equal ''"$(last_commit_message)"'' "Merged changes from subproject" &&
	undo
'

test_expect_success 'check if --message for merge works with squash too' '
	git subtree merge --prefix "sub dir" -m "Merged changes from subproject using squash" --squash sub2 &&
	check_equal ''"$(last_commit_message)"'' "Merged changes from subproject using squash" &&
	undo
'

test_expect_success 'merge new subproj history into subdir' '
	git subtree merge --prefix="sub dir" FETCH_HEAD &&
	check_equal ''"$(last_commit_message)"'' "Merge commit '"'"'"$(git rev-parse sub2)"'"'"' into mainline" &&
	undo
'

test_expect_success 'merge new subproj history into subdir/ with --prefix and --message' '
	git subtree merge --prefix="sub dir" --message="Merged changes from subproject" FETCH_HEAD &&
	check_equal "$(last_commit_message)" "Merged changes from subproject" &&
	undo
'

test_expect_success 'merge new subproj history into subdir/ with --squash and --prefix and --message' '
	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" &&
	undo
'

test_expect_success 'split requires option --prefix' '
	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: '"'"'" &&
	test_debug "cat actual" &&
	test_cmp expected actual &&
	rm -f expected actual
'

test_expect_success 'split requires path given by option --prefix must exist' '
	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: '"'"'" &&
	test_debug "cat actual" &&
	test_cmp expected actual &&
	rm -f expected actual
'

test_expect_success 'check if --message works for split+rejoin' '
	spl1=''"$(git subtree split --annotate='"'*'"' --prefix "sub dir" --onto FETCH_HEAD --message "Split & rejoin" --rejoin)"'' &&
	git branch spl1 "$spl1" &&
	check_equal ''"$(last_commit_message)"'' "Split & rejoin" &&
	undo
'

test_expect_success 'check split with --branch' '
	spl1=$(git subtree split --annotate='"'*'"' --prefix "sub dir" --onto FETCH_HEAD --message "Split & rejoin" --rejoin) &&
	undo &&
	git subtree split --annotate='"'*'"' --prefix "sub dir" --onto FETCH_HEAD --branch splitbr1 &&
	check_equal ''"$(git rev-parse splitbr1)"'' "$spl1"
'

test_expect_success 'check hash of split' '
	spl1=$(git subtree split --prefix "sub dir") &&
	git subtree split --prefix "sub dir" --branch splitbr1test &&
	check_equal ''"$(git rev-parse splitbr1test)"'' "$spl1" &&
	new_hash=$(git rev-parse splitbr1test~2) &&
	check_equal ''"$new_hash"'' "$subdir_hash"
'

test_expect_success 'check split with --branch for an existing branch' '
	spl1=''"$(git subtree split --annotate='"'*'"' --prefix "sub dir" --onto FETCH_HEAD --message "Split & rejoin" --rejoin)"'' &&
	undo &&
	git branch splitbr2 sub1 &&