Skip to content

Commit

Permalink
t7900-subtree: test the "space in a subdirectory name" case
Browse files Browse the repository at this point in the history 
In common case there can be spaces in a subdirectory name. Change tests
accorgingly to this statement.

Also, as far as a call to the `rejoin_msg` function (in `cmd_split`)
does not take into account such a case this patch fixes commit message
when `--rejoin` option is set .

Besides, as `fixnl` and `multiline` functions did not take into account
the "new" tested "space in a subdirectory name" case they become unused
and redundant, so they are removed.

Signed-off-by: Alexey Shumkin <Alex.Crezoff@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Alexey Shumkin authored and Junio C Hamano committed Sep 8, 2015
1 parent ec371ff commit c61eb41
Show file tree
Hide file tree
Showing 2 changed files with 76 additions and 73 deletions.
2 changes: 1 addition & 1 deletion contrib/subtree/git-subtree.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -648,7 +648,7 @@ cmd_split()
debug "Merging split branch into HEAD..."
latest_old=$(cache_get latest_old)
git merge -s ours \
-m "$(rejoin_msg $dir $latest_old $latest_new)" \
-m "$(rejoin_msg "$dir" $latest_old $latest_new)" \
$latest_new >&2 || exit $?
fi
if [ -n "$branch" ]; then
Expand Down
147 changes: 75 additions & 72 deletions contrib/subtree/t/t7900-subtree.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,25 +32,6 @@ check_equal()
fi
}

fixnl()
{
t=""
while read x; do
t="$t$x "
done
echo $t
}

multiline()
{
while read x; do
set -- $x
for d in "$@"; do
echo "$d"
done
done
}

undo()
{
git reset --hard HEAD~
Expand All @@ -62,11 +43,11 @@ last_commit_message()
}

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

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

test_expect_success 'add sub1' '
create sub1 &&
Expand Down Expand Up @@ -106,39 +87,39 @@ test_expect_success 'add main4' '
'

test_expect_success 'fetch subproj history' '
git fetch ./subproj sub1 &&
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=subdir sub1
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=subdir ./subproj sub1
test_must_fail git subtree pull --prefix="sub dir" ./"sub proj" sub1
'

test_expect_success 'check if --message works for add' '
git subtree add --prefix=subdir --message="Added subproject" sub1 &&
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 subdir -m "Added subproject using git subtree" sub1 &&
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 subdir -m "Added subproject with squash" --squash sub1 &&
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 to mainline' '
git subtree add --prefix=subdir/ FETCH_HEAD &&
check_equal ''"$(last_commit_message)"'' "Add '"'subdir/'"' from commit '"'"'''"$(git rev-parse sub1)"'''"'"'"
git subtree add --prefix="sub dir"/ FETCH_HEAD &&
check_equal ''"$(last_commit_message)"'' "Add '"'sub dir/'"' from commit '"'"'''"$(git rev-parse sub1)"'''"'"'"
'

# this shouldn't actually do anything, since FETCH_HEAD is already a parent
Expand All @@ -147,7 +128,7 @@ test_expect_success 'merge fetched subproj' '
'

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

Expand All @@ -157,29 +138,29 @@ test_expect_success 'add main6' '
'

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

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

test_expect_success 'check if --message works for merge' '
git subtree merge --prefix=subdir -m "Merged changes from subproject" sub2 &&
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 subdir -m "Merged changes from subproject using squash" --squash sub2 &&
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=subdir FETCH_HEAD &&
git subtree merge --prefix="sub dir" FETCH_HEAD &&
git branch pre-split &&
check_equal ''"$(last_commit_message)"'' "Merge commit '"'"'"$(git rev-parse sub2)"'"'"' into mainline" &&
undo
Expand Down Expand Up @@ -208,53 +189,53 @@ test_expect_success 'Check that the <prefix> exists for a split' '
'

test_expect_success 'check if --message works for split+rejoin' '
spl1=''"$(git subtree split --annotate='"'*'"' --prefix subdir --onto FETCH_HEAD --message "Split & rejoin" --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 subdir --onto FETCH_HEAD --message "Split & rejoin" --rejoin) &&
spl1=$(git subtree split --annotate='"'*'"' --prefix "sub dir" --onto FETCH_HEAD --message "Split & rejoin" --rejoin) &&
undo &&
git subtree split --annotate='"'*'"' --prefix subdir --onto FETCH_HEAD --branch splitbr1 &&
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 subdir) &&
git subtree split --prefix subdir --branch splitbr1test &&
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 subdir --onto FETCH_HEAD --message "Split & rejoin" --rejoin)"'' &&
spl1=''"$(git subtree split --annotate='"'*'"' --prefix "sub dir" --onto FETCH_HEAD --message "Split & rejoin" --rejoin)"'' &&
undo &&
git branch splitbr2 sub1 &&
git subtree split --annotate='"'*'"' --prefix subdir --onto FETCH_HEAD --branch splitbr2 &&
git subtree split --annotate='"'*'"' --prefix "sub dir" --onto FETCH_HEAD --branch splitbr2 &&
check_equal ''"$(git rev-parse splitbr2)"'' "$spl1"
'

test_expect_success 'check split with --branch for an incompatible branch' '
test_must_fail git subtree split --prefix subdir --onto FETCH_HEAD --branch subdir
test_must_fail git subtree split --prefix "sub dir" --onto FETCH_HEAD --branch subdir
'

test_expect_success 'check split+rejoin' '
spl1=''"$(git subtree split --annotate='"'*'"' --prefix subdir --onto FETCH_HEAD --message "Split & rejoin" --rejoin)"'' &&
spl1=''"$(git subtree split --annotate='"'*'"' --prefix "sub dir" --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"'"'"'"
git subtree split --annotate='"'*'"' --prefix "sub dir" --onto FETCH_HEAD --rejoin &&
check_equal ''"$(last_commit_message)"'' "Split '"'"'sub dir/'"'"' into commit '"'"'"$spl1"'"'"'"
'

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

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

test_expect_success 'merge split into subproj' '
git fetch .. spl1 &&
Expand All @@ -271,22 +252,22 @@ test_expect_success 'add sub9' '
cd ..

test_expect_success 'split for sub8' '
split2=''"$(git subtree split --annotate='"'*'"' --prefix subdir/ --rejoin)"'' &&
split2=''"$(git subtree split --annotate='"'*'"' --prefix "sub dir/" --rejoin)"'' &&
git branch split2 "$split2"
'

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

test_expect_success 'split for sub10' '
spl3=''"$(git subtree split --annotate='"'*'"' --prefix subdir --rejoin)"'' &&
spl3=''"$(git subtree split --annotate='"'*'"' --prefix "sub dir" --rejoin)"'' &&
git branch spl3 "$spl3"
'

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

test_expect_success 'merge split into subproj' '
git fetch .. spl3 &&
Expand All @@ -295,42 +276,64 @@ test_expect_success 'merge split into subproj' '
git branch subproj-merge-spl3
'

chkm="main4 main6"
chkms="main-sub10 main-sub5 main-sub7 main-sub8"
chkms_sub=$(echo $chkms | multiline | sed 's,^,subdir/,' | fixnl)
chks="sub1 sub2 sub3 sub9"
chks_sub=$(echo $chks | multiline | sed 's,^,subdir/,' | fixnl)
chkm="main4
main6"
chkms="main-sub10
main-sub5
main-sub7
main-sub8"
chkms_sub=$(cat <<TXT | sed 's,^,sub dir/,'
$chkms
TXT
)
chks="sub1
sub2
sub3
sub9"
chks_sub=$(cat <<TXT | sed 's,^,sub dir/,'
$chks
TXT
)

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"
subfiles="$(git ls-files)" &&
check_equal "$subfiles" "$chkms
$chks"
'

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"
allchanges=''"$(git log --name-only --pretty=format:'"''"' | sort | sed "/^$/d")"'' &&
check_equal "$allchanges" "$chkms
$chks"
'

# Back to mainline
cd ..

test_expect_success 'pull from subproj' '
git fetch ./subproj subproj-merge-spl3 &&
git fetch ./"sub proj" subproj-merge-spl3 &&
git branch subproj-merge-spl3 FETCH_HEAD &&
git subtree pull --prefix=subdir ./subproj subproj-merge-spl3
git subtree pull --prefix="sub dir" ./"sub proj" subproj-merge-spl3
'

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"
mainfiles=$(git ls-files) &&
check_equal "$mainfiles" "$chkm
$chkms_sub
$chks_sub"
'

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)"''
allchanges=''"$(git log --name-only --pretty=format:'"''"' | sort | sed "/^$/d")"'' &&
check_equal "$allchanges" ''"$(cat <<TXT | sort
$chkms
$chkm
$chks
$chkms_sub
TXT
)"''
'

test_expect_success 'make sure the --rejoin commits never make it into subproj' '
Expand Down Expand Up @@ -377,7 +380,7 @@ cd ../main
test_expect_success 'add sub as subdir in main' '
git fetch ../sub master &&
git branch sub2 FETCH_HEAD &&
git subtree add --prefix subdir sub2
git subtree add --prefix "sub dir" sub2
'

cd ../sub
Expand All @@ -392,16 +395,16 @@ cd ../main
test_expect_success 'merge from sub' '
git fetch ../sub master &&
git branch sub3 FETCH_HEAD &&
git subtree merge --prefix subdir sub3
git subtree merge --prefix "sub dir" sub3
'

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

test_expect_success 'split for main-sub4 without --onto' '
git subtree split --prefix subdir --branch mainsub4
git subtree split --prefix "sub dir" --branch mainsub4
'

# at this point, the new commit parent should be sub3 if it is not,
Expand Down

0 comments on commit c61eb41

Please sign in to comment.