mirror of
https://github.com/git/git
synced 2024-07-17 11:07:55 +00:00
Use Test Harness
Clean up the git-subtree tests to conform the git project conventions and use the existing test harness. Signed-off-by: David A. Greene <greened@obbligato.org>
This commit is contained in:
David A. Greene
parent
9e2a55a276
commit
d3a04e06c7
|
|
@ -1,6 +1,14 @@
|
|||
#!/bin/bash
|
||||
. shellopts.sh
|
||||
set -e
|
||||
#!/bin/sh
|
||||
#
|
||||
# Copyright (c) 2012 Avery Pennaraum
|
||||
#
|
||||
test_description='Basic porcelain support for subtrees
|
||||
|
||||
This test verifies the basic operation of the merge, pull, add
|
||||
and split subcommands of git subtree.
|
||||
'
|
||||
|
||||
. ./test-lib.sh
|
||||
|
||||
create()
|
||||
{
|
||||
|
|
@ -8,42 +16,16 @@ create()
|
|||
git add "$1"
|
||||
}
|
||||
|
||||
check()
|
||||
{
|
||||
echo
|
||||
echo "check:" "$@"
|
||||
if "$@"; then
|
||||
echo ok
|
||||
return 0
|
||||
else
|
||||
echo FAILED
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
check_not()
|
||||
{
|
||||
echo
|
||||
echo "check: NOT " "$@"
|
||||
if "$@"; then
|
||||
echo FAILED
|
||||
exit 1
|
||||
else
|
||||
echo ok
|
||||
return 0
|
||||
fi
|
||||
}
|
||||
|
||||
check_equal()
|
||||
{
|
||||
echo
|
||||
echo "check a:" "{$1}"
|
||||
echo " b:" "{$2}"
|
||||
test_debug 'echo'
|
||||
test_debug "echo \"check a:\" \"{$1}\""
|
||||
test_debug "echo \" b:\" \"{$2}\""
|
||||
if [ "$1" = "$2" ]; then
|
||||
return 0
|
||||
else
|
||||
echo FAILED
|
||||
exit 1
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
@ -76,144 +58,257 @@ last_commit_message()
|
|||
git log --pretty=format:%s -1
|
||||
}
|
||||
|
||||
rm -rf mainline subproj
|
||||
mkdir mainline subproj
|
||||
# 1
|
||||
test_expect_success 'init subproj' '
|
||||
test_create_repo subproj
|
||||
'
|
||||
|
||||
# To the subproject!
|
||||
cd subproj
|
||||
git init
|
||||
|
||||
create sub1
|
||||
git commit -m 'sub1'
|
||||
git branch sub1
|
||||
git branch -m master subproj
|
||||
check true
|
||||
# 2
|
||||
test_expect_success 'add sub1' '
|
||||
create sub1 &&
|
||||
git commit -m "sub1" &&
|
||||
git branch sub1 &&
|
||||
git branch -m master subproj
|
||||
'
|
||||
|
||||
create sub2
|
||||
git commit -m 'sub2'
|
||||
git branch sub2
|
||||
# 3
|
||||
test_expect_success 'add sub2' '
|
||||
create sub2 &&
|
||||
git commit -m "sub2" &&
|
||||
git branch sub2
|
||||
'
|
||||
|
||||
create sub3
|
||||
git commit -m 'sub3'
|
||||
git branch sub3
|
||||
# 4
|
||||
test_expect_success 'add sub3' '
|
||||
create sub3 &&
|
||||
git commit -m "sub3" &&
|
||||
git branch sub3
|
||||
'
|
||||
|
||||
cd ../mainline
|
||||
git init
|
||||
create main4
|
||||
git commit -m 'main4'
|
||||
git branch -m master mainline
|
||||
git branch subdir
|
||||
# Back to mainline
|
||||
cd ..
|
||||
|
||||
git fetch ../subproj sub1
|
||||
git branch sub1 FETCH_HEAD
|
||||
# 5
|
||||
test_expect_success 'add main4' '
|
||||
create main4 &&
|
||||
git commit -m "main4" &&
|
||||
git branch -m master mainline &&
|
||||
git branch subdir
|
||||
'
|
||||
|
||||
# check if --message works for add
|
||||
check_not git subtree merge --prefix=subdir sub1
|
||||
check_not git subtree pull --prefix=subdir ../subproj sub1
|
||||
git subtree add --prefix=subdir --message="Added subproject" sub1
|
||||
check_equal "$(last_commit_message)" "Added subproject"
|
||||
undo
|
||||
# 6
|
||||
test_expect_success 'fetch subproj history' '
|
||||
git fetch ./subproj sub1 &&
|
||||
git branch sub1 FETCH_HEAD
|
||||
'
|
||||
|
||||
# check if --message works as -m and --prefix as -P
|
||||
git subtree add -P subdir -m "Added subproject using git subtree" sub1
|
||||
check_equal "$(last_commit_message)" "Added subproject using git subtree"
|
||||
undo
|
||||
# 7
|
||||
test_expect_success 'no subtree exists in main tree' '
|
||||
test_must_fail git subtree merge --prefix=subdir sub1
|
||||
'
|
||||
|
||||
# check if --message works with squash too
|
||||
git subtree add -P subdir -m "Added subproject with squash" --squash sub1
|
||||
check_equal "$(last_commit_message)" "Added subproject with squash"
|
||||
undo
|
||||
# 8
|
||||
test_expect_success 'no pull from non-existant subtree' '
|
||||
test_must_fail git subtree pull --prefix=subdir ./subproj sub1
|
||||
'
|
||||
|
||||
git subtree add --prefix=subdir/ FETCH_HEAD
|
||||
check_equal "$(last_commit_message)" "Add 'subdir/' from commit '$(git rev-parse sub1)'"
|
||||
# 9
|
||||
test_expect_success 'check if --message works for add' '
|
||||
git subtree add --prefix=subdir --message="Added subproject" sub1 &&
|
||||
check_equal ''"$(last_commit_message)"'' "Added subproject" &&
|
||||
undo
|
||||
'
|
||||
|
||||
# 10
|
||||
test_expect_success 'check if --message works as -m and --prefix as -P' '
|
||||
git subtree add -P subdir -m "Added subproject using git subtree" sub1 &&
|
||||
check_equal ''"$(last_commit_message)"'' "Added subproject using git subtree" &&
|
||||
undo
|
||||
'
|
||||
|
||||
# 11
|
||||
test_expect_success 'check if --message works with squash too' '
|
||||
git subtree add -P subdir -m "Added subproject with squash" --squash sub1 &&
|
||||
check_equal ''"$(last_commit_message)"'' "Added subproject with squash" &&
|
||||
undo
|
||||
'
|
||||
|
||||
# 12
|
||||
test_expect_success 'add subproj to mainline' '
|
||||
git subtree add --prefix=subdir/ FETCH_HEAD &&
|
||||
check_equal ''"$(last_commit_message)"'' "Add '"'subdir/'"' from commit '"'"'''"$(git rev-parse sub1)"'''"'"'"
|
||||
'
|
||||
|
||||
# 13
|
||||
# this shouldn't actually do anything, since FETCH_HEAD is already a parent
|
||||
git merge -m 'merge -s -ours' -s ours FETCH_HEAD
|
||||
test_expect_success 'merge fetched subproj' '
|
||||
git merge -m "merge -s -ours" -s ours FETCH_HEAD
|
||||
'
|
||||
|
||||
create subdir/main-sub5
|
||||
git commit -m 'main-sub5'
|
||||
# 14
|
||||
test_expect_success 'add main-sub5' '
|
||||
create subdir/main-sub5 &&
|
||||
git commit -m "main-sub5"
|
||||
'
|
||||
|
||||
create main6
|
||||
git commit -m 'main6 boring'
|
||||
# 15
|
||||
test_expect_success 'add main6' '
|
||||
create main6 &&
|
||||
git commit -m "main6 boring"
|
||||
'
|
||||
|
||||
create subdir/main-sub7
|
||||
git commit -m 'main-sub7'
|
||||
# 16
|
||||
test_expect_success 'add main-sub7' '
|
||||
create subdir/main-sub7 &&
|
||||
git commit -m "main-sub7"
|
||||
'
|
||||
|
||||
git fetch ../subproj sub2
|
||||
git branch sub2 FETCH_HEAD
|
||||
# 17
|
||||
test_expect_success 'fetch new subproj history' '
|
||||
git fetch ./subproj sub2 &&
|
||||
git branch sub2 FETCH_HEAD
|
||||
'
|
||||
|
||||
# check if --message works for merge
|
||||
git subtree merge --prefix=subdir -m "Merged changes from subproject" sub2
|
||||
check_equal "$(last_commit_message)" "Merged changes from subproject"
|
||||
undo
|
||||
# 18
|
||||
test_expect_success 'check if --message works for merge' '
|
||||
git subtree merge --prefix=subdir -m "Merged changes from subproject" sub2 &&
|
||||
check_equal ''"$(last_commit_message)"'' "Merged changes from subproject" &&
|
||||
undo
|
||||
'
|
||||
|
||||
# check if --message for merge works with squash too
|
||||
git subtree merge --prefix subdir -m "Merged changes from subproject using squash" --squash sub2
|
||||
check_equal "$(last_commit_message)" "Merged changes from subproject using squash"
|
||||
undo
|
||||
# 19
|
||||
test_expect_success 'check if --message for merge works with squash too' '
|
||||
git subtree merge --prefix subdir -m "Merged changes from subproject using squash" --squash sub2 &&
|
||||
check_equal ''"$(last_commit_message)"'' "Merged changes from subproject using squash" &&
|
||||
undo
|
||||
'
|
||||
|
||||
git subtree merge --prefix=subdir FETCH_HEAD
|
||||
git branch pre-split
|
||||
check_equal "$(last_commit_message)" "Merge commit '$(git rev-parse sub2)' into mainline"
|
||||
# 20
|
||||
test_expect_success 'merge new subproj history into subdir' '
|
||||
git subtree merge --prefix=subdir FETCH_HEAD &&
|
||||
git branch pre-split &&
|
||||
check_equal ''"$(last_commit_message)"'' "Merge commit '"'"'"$(git rev-parse sub2)"'"'"' into mainline"
|
||||
'
|
||||
|
||||
# Check that prefix argument is required for split (exits with warning and exit status = 1)
|
||||
! result=$(git subtree split 2>&1)
|
||||
check_equal "You must provide the --prefix option." "$result"
|
||||
# 21
|
||||
test_expect_success 'Check that prefix argument is required for split' '
|
||||
echo "You must provide the --prefix option." > expected &&
|
||||
test_must_fail git subtree split > actual 2>&1 &&
|
||||
test_debug "echo -n expected: " &&
|
||||
test_debug "cat expected" &&
|
||||
test_debug "echo -n actual: " &&
|
||||
test_debug "cat actual" &&
|
||||
test_cmp expected actual &&
|
||||
rm -f expected actual
|
||||
'
|
||||
|
||||
# Check that the <prefix> exists for a split.
|
||||
! result=$(git subtree split --prefix=non-existent-directory 2>&1)
|
||||
check_equal "'non-existent-directory' does not exist; use 'git subtree add'" \
|
||||
"$result"
|
||||
# 22
|
||||
test_expect_success 'Check that the <prefix> exists for a split' '
|
||||
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 "echo -n expected: " &&
|
||||
test_debug "cat expected" &&
|
||||
test_debug "echo -n actual: " &&
|
||||
test_debug "cat actual" &&
|
||||
test_cmp expected actual
|
||||
# rm -f expected actual
|
||||
'
|
||||
|
||||
# check if --message works for split+rejoin
|
||||
spl1=$(git subtree split --annotate='*' --prefix subdir --onto FETCH_HEAD --message "Split & rejoin" --rejoin)
|
||||
echo "spl1={$spl1}"
|
||||
git branch spl1 "$spl1"
|
||||
check_equal "$(last_commit_message)" "Split & rejoin"
|
||||
undo
|
||||
# 23
|
||||
test_expect_success 'check if --message works for split+rejoin' '
|
||||
spl1=''"$(git subtree split --annotate='"'*'"' --prefix subdir --onto FETCH_HEAD --message "Split & rejoin" --rejoin)"'' &&
|
||||
git branch spl1 "$spl1" &&
|
||||
check_equal ''"$(last_commit_message)"'' "Split & rejoin" &&
|
||||
undo
|
||||
'
|
||||
|
||||
# check split with --branch
|
||||
git subtree split --annotate='*' --prefix subdir --onto FETCH_HEAD --branch splitbr1
|
||||
check_equal "$(git rev-parse splitbr1)" "$spl1"
|
||||
# 24
|
||||
test_expect_success 'check split with --branch' '
|
||||
spl1=$(git subtree split --annotate='"'*'"' --prefix subdir --onto FETCH_HEAD --message "Split & rejoin" --rejoin) &&
|
||||
undo &&
|
||||
git subtree split --annotate='"'*'"' --prefix subdir --onto FETCH_HEAD --branch splitbr1 &&
|
||||
check_equal ''"$(git rev-parse splitbr1)"'' "$spl1"
|
||||
'
|
||||
|
||||
# check split with --branch for an existing branch
|
||||
git branch splitbr2 sub1
|
||||
git subtree split --annotate='*' --prefix subdir --onto FETCH_HEAD --branch splitbr2
|
||||
check_equal "$(git rev-parse splitbr2)" "$spl1"
|
||||
# 25
|
||||
test_expect_success 'check split with --branch for an existing branch' '
|
||||
spl1=''"$(git subtree split --annotate='"'*'"' --prefix subdir --onto FETCH_HEAD --message "Split & rejoin" --rejoin)"'' &&
|
||||
undo &&
|
||||
git branch splitbr2 sub1 &&
|
||||
git subtree split --annotate='"'*'"' --prefix subdir --onto FETCH_HEAD --branch splitbr2 &&
|
||||
check_equal ''"$(git rev-parse splitbr2)"'' "$spl1"
|
||||
'
|
||||
|
||||
# check split with --branch for an incompatible branch
|
||||
result=$(git subtree split --prefix subdir --onto FETCH_HEAD --branch subdir || echo "caught error")
|
||||
check_equal "$result" "caught error"
|
||||
# 26
|
||||
test_expect_success 'check split with --branch for an incompatible branch' '
|
||||
test_must_fail git subtree split --prefix subdir --onto FETCH_HEAD --branch subdir
|
||||
'
|
||||
|
||||
|
||||
git subtree split --annotate='*' --prefix subdir --onto FETCH_HEAD --rejoin
|
||||
check_equal "$(last_commit_message)" "Split 'subdir/' into commit '$spl1'"
|
||||
# 27
|
||||
test_expect_success 'check split+rejoin' '
|
||||
spl1=''"$(git subtree split --annotate='"'*'"' --prefix subdir --onto FETCH_HEAD --message "Split & rejoin" --rejoin)"'' &&
|
||||
undo &&
|
||||
git subtree split --annotate='"'*'"' --prefix subdir --onto FETCH_HEAD --rejoin &&
|
||||
check_equal ''"$(last_commit_message)"'' "Split '"'"'subdir/'"'"' into commit '"'"'"$spl1"'"'"'"
|
||||
'
|
||||
|
||||
create subdir/main-sub8
|
||||
git commit -m 'main-sub8'
|
||||
# 28
|
||||
test_expect_success 'add main-sub8' '
|
||||
create subdir/main-sub8 &&
|
||||
git commit -m "main-sub8"
|
||||
'
|
||||
|
||||
cd ../subproj
|
||||
git fetch ../mainline spl1
|
||||
git branch spl1 FETCH_HEAD
|
||||
git merge FETCH_HEAD
|
||||
# To the subproject!
|
||||
cd ./subproj
|
||||
|
||||
create sub9
|
||||
git commit -m 'sub9'
|
||||
# 29
|
||||
test_expect_success 'merge split into subproj' '
|
||||
git fetch .. spl1 &&
|
||||
git branch spl1 FETCH_HEAD &&
|
||||
git merge FETCH_HEAD
|
||||
'
|
||||
|
||||
cd ../mainline
|
||||
split2=$(git subtree split --annotate='*' --prefix subdir/ --rejoin)
|
||||
git branch split2 "$split2"
|
||||
# 30
|
||||
test_expect_success 'add sub9' '
|
||||
create sub9 &&
|
||||
git commit -m "sub9"
|
||||
'
|
||||
|
||||
create subdir/main-sub10
|
||||
git commit -m 'main-sub10'
|
||||
# Back to mainline
|
||||
cd ..
|
||||
|
||||
spl3=$(git subtree split --annotate='*' --prefix subdir --rejoin)
|
||||
git branch spl3 "$spl3"
|
||||
# 31
|
||||
test_expect_success 'split for sub8' '
|
||||
split2=''"$(git subtree split --annotate='"'*'"' --prefix subdir/ --rejoin)"''
|
||||
git branch split2 "$split2"
|
||||
'
|
||||
|
||||
cd ../subproj
|
||||
git fetch ../mainline spl3
|
||||
git branch spl3 FETCH_HEAD
|
||||
git merge FETCH_HEAD
|
||||
git branch subproj-merge-spl3
|
||||
# 32
|
||||
test_expect_success 'add main-sub10' '
|
||||
create subdir/main-sub10 &&
|
||||
git commit -m "main-sub10"
|
||||
'
|
||||
|
||||
# 33
|
||||
test_expect_success 'split for sub10' '
|
||||
spl3=''"$(git subtree split --annotate='"'*'"' --prefix subdir --rejoin)"'' &&
|
||||
git branch spl3 "$spl3"
|
||||
'
|
||||
|
||||
# To the subproject!
|
||||
cd ./subproj
|
||||
|
||||
# 34
|
||||
test_expect_success 'merge split into subproj' '
|
||||
git fetch .. spl3 &&
|
||||
git branch spl3 FETCH_HEAD &&
|
||||
git merge FETCH_HEAD &&
|
||||
git branch subproj-merge-spl3
|
||||
'
|
||||
|
||||
chkm="main4 main6"
|
||||
chkms="main-sub10 main-sub5 main-sub7 main-sub8"
|
||||
|
|
@ -221,89 +316,150 @@ chkms_sub=$(echo $chkms | multiline | sed 's,^,subdir/,' | fixnl)
|
|||
chks="sub1 sub2 sub3 sub9"
|
||||
chks_sub=$(echo $chks | multiline | sed 's,^,subdir/,' | fixnl)
|
||||
|
||||
# make sure exactly the right set of files ends up in the subproj
|
||||
subfiles=$(git ls-files | fixnl)
|
||||
check_equal "$subfiles" "$chkms $chks"
|
||||
# 35
|
||||
test_expect_success 'make sure exactly the right set of files ends up in the subproj' '
|
||||
subfiles=''"$(git ls-files | fixnl)"'' &&
|
||||
check_equal "$subfiles" "$chkms $chks"
|
||||
'
|
||||
|
||||
# make sure the subproj history *only* contains commits that affect the subdir.
|
||||
allchanges=$(git log --name-only --pretty=format:'' | sort | fixnl)
|
||||
check_equal "$allchanges" "$chkms $chks"
|
||||
# 36
|
||||
test_expect_success 'make sure the subproj history *only* contains commits that affect the subdir' '
|
||||
allchanges=''"$(git log --name-only --pretty=format:'"''"' | sort | fixnl)"'' &&
|
||||
check_equal "$allchanges" "$chkms $chks"
|
||||
'
|
||||
|
||||
cd ../mainline
|
||||
git fetch ../subproj subproj-merge-spl3
|
||||
git branch subproj-merge-spl3 FETCH_HEAD
|
||||
git subtree pull --prefix=subdir ../subproj subproj-merge-spl3
|
||||
# Back to mainline
|
||||
cd ..
|
||||
|
||||
# make sure exactly the right set of files ends up in the mainline
|
||||
mainfiles=$(git ls-files | fixnl)
|
||||
check_equal "$mainfiles" "$chkm $chkms_sub $chks_sub"
|
||||
# 37
|
||||
test_expect_success 'pull from subproj' '
|
||||
git fetch ./subproj subproj-merge-spl3 &&
|
||||
git branch subproj-merge-spl3 FETCH_HEAD &&
|
||||
git subtree pull --prefix=subdir ./subproj subproj-merge-spl3
|
||||
'
|
||||
|
||||
# make sure each filename changed exactly once in the entire history.
|
||||
# 'main-sub??' and '/subdir/main-sub??' both change, because those are the
|
||||
# changes that were split into their own history. And 'subdir/sub??' never
|
||||
# change, since they were *only* changed in the subtree branch.
|
||||
allchanges=$(git log --name-only --pretty=format:'' | sort | fixnl)
|
||||
check_equal "$allchanges" "$(echo $chkms $chkm $chks $chkms_sub | multiline | sort | fixnl)"
|
||||
# 38
|
||||
test_expect_success 'make sure exactly the right set of files ends up in the mainline' '
|
||||
mainfiles=''"$(git ls-files | fixnl)"'' &&
|
||||
check_equal "$mainfiles" "$chkm $chkms_sub $chks_sub"
|
||||
'
|
||||
|
||||
# make sure the --rejoin commits never make it into subproj
|
||||
check_equal "$(git log --pretty=format:'%s' HEAD^2 | grep -i split)" ""
|
||||
# 39
|
||||
test_expect_success 'make sure each filename changed exactly once in the entire history' '
|
||||
# main-sub?? and /subdir/main-sub?? both change, because those are the
|
||||
# changes that were split into their own history. And subdir/sub?? never
|
||||
# change, since they were *only* changed in the subtree branch.
|
||||
allchanges=''"$(git log --name-only --pretty=format:'"''"' | sort | fixnl)"'' &&
|
||||
check_equal "$allchanges" ''"$(echo $chkms $chkm $chks $chkms_sub | multiline | sort | fixnl)"''
|
||||
'
|
||||
|
||||
# make sure no 'git subtree' tagged commits make it into subproj. (They're
|
||||
# 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.*:')" ""
|
||||
# 40
|
||||
test_expect_success 'make sure the --rejoin commits never make it into subproj' '
|
||||
check_equal ''"$(git log --pretty=format:'"'%s'"' HEAD^2 | grep -i split)"'' ""
|
||||
'
|
||||
|
||||
# 41
|
||||
test_expect_success 'make sure no "git subtree" tagged commits make it into subproj' '
|
||||
# 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.*:")"'' ""
|
||||
'
|
||||
|
||||
# check if split can find proper base without --onto
|
||||
# prepare second pair of repositories
|
||||
mkdir test2
|
||||
cd test2
|
||||
|
||||
mkdir main
|
||||
# 42
|
||||
test_expect_success 'init main' '
|
||||
test_create_repo main
|
||||
'
|
||||
|
||||
cd main
|
||||
git init
|
||||
create main1
|
||||
git commit -m "main1"
|
||||
|
||||
# 43
|
||||
test_expect_success 'add main1' '
|
||||
create main1 &&
|
||||
git commit -m "main1"
|
||||
'
|
||||
|
||||
cd ..
|
||||
mkdir sub
|
||||
|
||||
# 44
|
||||
test_expect_success 'init sub' '
|
||||
test_create_repo sub
|
||||
'
|
||||
|
||||
cd sub
|
||||
git init
|
||||
create sub2
|
||||
git commit -m "sub2"
|
||||
|
||||
# 45
|
||||
test_expect_success 'add sub2' '
|
||||
create sub2 &&
|
||||
git commit -m "sub2"
|
||||
'
|
||||
|
||||
cd ../main
|
||||
git fetch ../sub master
|
||||
git branch sub2 FETCH_HEAD
|
||||
git subtree add --prefix subdir sub2
|
||||
|
||||
# check if split can find proper base without --onto
|
||||
|
||||
# 46
|
||||
test_expect_success 'add sub as subdir in main' '
|
||||
git fetch ../sub master &&
|
||||
git branch sub2 FETCH_HEAD &&
|
||||
git subtree add --prefix subdir sub2
|
||||
'
|
||||
|
||||
cd ../sub
|
||||
create sub3
|
||||
git commit -m "sub3"
|
||||
|
||||
# 47
|
||||
test_expect_success 'add sub3' '
|
||||
create sub3 &&
|
||||
git commit -m "sub3"
|
||||
'
|
||||
|
||||
cd ../main
|
||||
git fetch ../sub master
|
||||
git branch sub3 FETCH_HEAD
|
||||
git subtree merge --prefix subdir sub3
|
||||
|
||||
create subdir/main-sub4
|
||||
git commit -m "main-sub4"
|
||||
git subtree split --prefix subdir --branch mainsub4
|
||||
# 48
|
||||
test_expect_success 'merge from sub' '
|
||||
git fetch ../sub master &&
|
||||
git branch sub3 FETCH_HEAD &&
|
||||
git subtree merge --prefix subdir sub3
|
||||
'
|
||||
|
||||
# at this point, the new commit's parent should be sub3
|
||||
# if it's not, something went wrong (the "newparent" of "master~" commit should have been sub3,
|
||||
# but it wasn't, because it's cache was not set to itself)
|
||||
check_equal "$(git log --pretty=format:%P -1 mainsub4)" "$(git rev-parse sub3)"
|
||||
# 49
|
||||
test_expect_success 'add main-sub4' '
|
||||
create subdir/main-sub4 &&
|
||||
git commit -m "main-sub4"
|
||||
'
|
||||
|
||||
mkdir subdir2
|
||||
create subdir2/main-sub5
|
||||
git commit -m "main-sub5"
|
||||
git subtree split --prefix subdir2 --branch mainsub5
|
||||
# 50
|
||||
test_expect_success 'split for main-sub4 without --onto' '
|
||||
git subtree split --prefix subdir --branch mainsub4
|
||||
'
|
||||
|
||||
# also test that we still can split out an entirely new subtree
|
||||
# if the parent of the first commit in the tree isn't empty,
|
||||
# then the new subtree has accidently been attached to something
|
||||
check_equal "$(git log --pretty=format:%P -1 mainsub5)" ""
|
||||
# at this point, the new commit parent should be sub3 if it is not,
|
||||
# something went wrong (the "newparent" of "master~" commit should
|
||||
# have been sub3, but it was not, because its cache was not set to
|
||||
# itself)
|
||||
|
||||
# 51
|
||||
test_expect_success 'check that the commit parent is sub3' '
|
||||
check_equal ''"$(git log --pretty=format:%P -1 mainsub4)"'' ''"$(git rev-parse sub3)"''
|
||||
'
|
||||
|
||||
# 52
|
||||
test_expect_success 'add main-sub5' '
|
||||
mkdir subdir2 &&
|
||||
create subdir2/main-sub5 &&
|
||||
git commit -m "main-sub5"
|
||||
'
|
||||
|
||||
# 53
|
||||
test_expect_success 'split for main-sub5 without --onto' '
|
||||
# also test that we still can split out an entirely new subtree
|
||||
# if the parent of the first commit in the tree is not empty,
|
||||
# then the new subtree has accidently been attached to something
|
||||
git subtree split --prefix subdir2 --branch mainsub5 &&
|
||||
check_equal ''"$(git log --pretty=format:%P -1 mainsub5)"'' ""
|
||||
'
|
||||
|
||||
# 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
|
||||
|
|
@ -313,7 +469,7 @@ joincommits()
|
|||
commit=
|
||||
all=
|
||||
while read x y; do
|
||||
echo "{$x}" >&2
|
||||
#echo "{$x}" >&2
|
||||
if [ -z "$x" ]; then
|
||||
continue
|
||||
elif [ "$x" = "commit:" ]; then
|
||||
|
|
@ -328,15 +484,23 @@ joincommits()
|
|||
done
|
||||
echo "$commit $all"
|
||||
}
|
||||
x=
|
||||
git log --pretty=format:'commit: %H' | joincommits |
|
||||
( while read commit a b; do
|
||||
echo "Verifying commit $commit"
|
||||
check_equal "$b" ""
|
||||
x=1
|
||||
done
|
||||
check_equal "$x" 1
|
||||
) || exit 1
|
||||
|
||||
echo
|
||||
echo 'ok'
|
||||
# 54
|
||||
test_expect_success 'verify one file change per commit' '
|
||||
x= &&
|
||||
list=''"$(git log --pretty=format:'"'commit: %H'"' | joincommits)"'' &&
|
||||
# test_debug "echo HERE" &&
|
||||
# test_debug "echo ''"$list"''" &&
|
||||
(git log --pretty=format:'"'commit: %H'"' | joincommits |
|
||||
( while read commit a b; do
|
||||
test_debug "echo Verifying commit "''"$commit"''
|
||||
test_debug "echo a: "''"$a"''
|
||||
test_debug "echo b: "''"$b"''
|
||||
check_equal "$b" ""
|
||||
x=1
|
||||
done
|
||||
check_equal "$x" 1
|
||||
))
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
|
|||
Loading…
Reference in a new issue