зеркало из https://github.com/microsoft/git.git
Merge branch 'dg/subtree-fixes'
contrib/subtree updates, but here are only the ones that looked ready. The remainder of the patches will have another day. * dg/subtree-fixes: contrib/subtree: make the manual directory if needed contrib/subtree: honor DESTDIR contrib/subtree: fix synopsis contrib/subtree: better error handling for 'subtree add' contrib/subtree: use %B for split subject/body contrib/subtree: remove test number comments
This commit is contained in:
Junio C Hamano
Коммит
260adc87b3
|
|
@ -30,12 +30,13 @@ $(GIT_SUBTREE): $(GIT_SUBTREE_SH)
|
|||
doc: $(GIT_SUBTREE_DOC)
|
||||
|
||||
install: $(GIT_SUBTREE)
|
||||
$(INSTALL) -m 755 $(GIT_SUBTREE) $(libexecdir)
|
||||
$(INSTALL) -m 755 $(GIT_SUBTREE) $(DESTDIR)$(libexecdir)
|
||||
|
||||
install-doc: install-man
|
||||
|
||||
install-man: $(GIT_SUBTREE_DOC)
|
||||
$(INSTALL) -m 644 $^ $(man1dir)
|
||||
$(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)
|
||||
$(INSTALL) -m 644 $^ $(DESTDIR)$(man1dir)
|
||||
|
||||
$(GIT_SUBTREE_DOC): $(GIT_SUBTREE_XML)
|
||||
xmlto -m $(MANPAGE_NORMAL_XSL) man $^
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ if [ $# -eq 0 ]; then
|
|||
fi
|
||||
OPTS_SPEC="\
|
||||
git subtree add --prefix=<prefix> <commit>
|
||||
git subtree add --prefix=<prefix> <repository> <commit>
|
||||
git subtree merge --prefix=<prefix> <commit>
|
||||
git subtree pull --prefix=<prefix> <repository> <refspec...>
|
||||
git subtree push --prefix=<prefix> <repository> <refspec...>
|
||||
|
|
@ -296,7 +297,7 @@ copy_commit()
|
|||
# We're going to set some environment vars here, so
|
||||
# do it in a subshell to get rid of them safely later
|
||||
debug copy_commit "{$1}" "{$2}" "{$3}"
|
||||
git log -1 --pretty=format:'%an%n%ae%n%ad%n%cn%n%ce%n%cd%n%s%n%n%b' "$1" |
|
||||
git log -1 --pretty=format:'%an%n%ae%n%ad%n%cn%n%ce%n%cd%n%B' "$1" |
|
||||
(
|
||||
read GIT_AUTHOR_NAME
|
||||
read GIT_AUTHOR_EMAIL
|
||||
|
|
@ -497,12 +498,23 @@ cmd_add()
|
|||
ensure_clean
|
||||
|
||||
if [ $# -eq 1 ]; then
|
||||
"cmd_add_commit" "$@"
|
||||
git rev-parse -q --verify "$1^{commit}" >/dev/null ||
|
||||
die "'$1' does not refer to a commit"
|
||||
|
||||
"cmd_add_commit" "$@"
|
||||
elif [ $# -eq 2 ]; then
|
||||
"cmd_add_repository" "$@"
|
||||
# Technically we could accept a refspec here but we're
|
||||
# just going to turn around and add FETCH_HEAD under the
|
||||
# specified directory. Allowing a refspec might be
|
||||
# misleading because we won't do anything with any other
|
||||
# branches fetched via the refspec.
|
||||
git rev-parse -q --verify "$2^{commit}" >/dev/null ||
|
||||
die "'$2' does not refer to a commit"
|
||||
|
||||
"cmd_add_repository" "$@"
|
||||
else
|
||||
say "error: parameters were '$@'"
|
||||
die "Provide either a refspec or a repository and refspec."
|
||||
die "Provide either a commit or a repository and commit."
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,8 @@ git-subtree - Merge subtrees together and split repository into subtrees
|
|||
SYNOPSIS
|
||||
--------
|
||||
[verse]
|
||||
'git subtree' add -P <prefix> <commit>
|
||||
'git subtree' add -P <prefix> <refspec>
|
||||
'git subtree' add -P <prefix> <repository> <refspec>
|
||||
'git subtree' pull -P <prefix> <repository> <refspec...>
|
||||
'git subtree' push -P <prefix> <repository> <refspec...>
|
||||
'git subtree' merge -P <prefix> <commit>
|
||||
|
|
|
|||
|
|
@ -60,7 +60,6 @@ last_commit_message()
|
|||
git log --pretty=format:%s -1
|
||||
}
|
||||
|
||||
# 1
|
||||
test_expect_success 'init subproj' '
|
||||
test_create_repo subproj
|
||||
'
|
||||
|
|
@ -68,7 +67,6 @@ test_expect_success 'init subproj' '
|
|||
# To the subproject!
|
||||
cd subproj
|
||||
|
||||
# 2
|
||||
test_expect_success 'add sub1' '
|
||||
create sub1 &&
|
||||
git commit -m "sub1" &&
|
||||
|
|
@ -76,14 +74,16 @@ test_expect_success 'add sub1' '
|
|||
git branch -m master subproj
|
||||
'
|
||||
|
||||
# 3
|
||||
# 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
|
||||
'
|
||||
|
||||
# 4
|
||||
test_expect_success 'add sub3' '
|
||||
create sub3 &&
|
||||
git commit -m "sub3" &&
|
||||
|
|
@ -93,7 +93,6 @@ test_expect_success 'add sub3' '
|
|||
# Back to mainline
|
||||
cd ..
|
||||
|
||||
# 5
|
||||
test_expect_success 'add main4' '
|
||||
create main4 &&
|
||||
git commit -m "main4" &&
|
||||
|
|
@ -101,101 +100,85 @@ test_expect_success 'add main4' '
|
|||
git branch subdir
|
||||
'
|
||||
|
||||
# 6
|
||||
test_expect_success 'fetch subproj history' '
|
||||
git fetch ./subproj sub1 &&
|
||||
git branch sub1 FETCH_HEAD
|
||||
'
|
||||
|
||||
# 7
|
||||
test_expect_success 'no subtree exists in main tree' '
|
||||
test_must_fail git subtree merge --prefix=subdir sub1
|
||||
'
|
||||
|
||||
# 8
|
||||
test_expect_success 'no pull from non-existant subtree' '
|
||||
test_must_fail git subtree pull --prefix=subdir ./subproj 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
|
||||
test_expect_success 'merge fetched subproj' '
|
||||
git merge -m "merge -s -ours" -s ours FETCH_HEAD
|
||||
'
|
||||
|
||||
# 14
|
||||
test_expect_success 'add main-sub5' '
|
||||
create subdir/main-sub5 &&
|
||||
git commit -m "main-sub5"
|
||||
'
|
||||
|
||||
# 15
|
||||
test_expect_success 'add main6' '
|
||||
create main6 &&
|
||||
git commit -m "main6 boring"
|
||||
'
|
||||
|
||||
# 16
|
||||
test_expect_success 'add main-sub7' '
|
||||
create subdir/main-sub7 &&
|
||||
git commit -m "main-sub7"
|
||||
'
|
||||
|
||||
# 17
|
||||
test_expect_success 'fetch new subproj history' '
|
||||
git fetch ./subproj sub2 &&
|
||||
git branch sub2 FETCH_HEAD
|
||||
'
|
||||
|
||||
# 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
|
||||
'
|
||||
|
||||
# 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
|
||||
'
|
||||
|
||||
# 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"
|
||||
'
|
||||
|
||||
# 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 &&
|
||||
|
|
@ -207,7 +190,6 @@ test_expect_success 'Check that prefix argument is required for split' '
|
|||
rm -f expected actual
|
||||
'
|
||||
|
||||
# 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 &&
|
||||
|
|
@ -219,7 +201,6 @@ test_expect_success 'Check that the <prefix> exists for a split' '
|
|||
# rm -f expected actual
|
||||
'
|
||||
|
||||
# 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" &&
|
||||
|
|
@ -227,15 +208,24 @@ test_expect_success 'check if --message works for split+rejoin' '
|
|||
undo
|
||||
'
|
||||
|
||||
# 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"
|
||||
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"
|
||||
'
|
||||
|
||||
test_expect_success 'check hash of split' '
|
||||
spl1=$(git subtree split --prefix subdir) &&
|
||||
undo &&
|
||||
git subtree split --prefix subdir --branch splitbr1test &&
|
||||
check_equal ''"$(git rev-parse splitbr1test)"'' "$spl1"
|
||||
git checkout splitbr1test &&
|
||||
new_hash=$(git rev-parse HEAD~2) &&
|
||||
git checkout mainline &&
|
||||
check_equal ''"$new_hash"'' "$subdir_hash"
|
||||
'
|
||||
|
||||
# 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 &&
|
||||
|
|
@ -244,13 +234,10 @@ test_expect_success 'check split with --branch for an existing branch' '
|
|||
check_equal ''"$(git rev-parse splitbr2)"'' "$spl1"
|
||||
'
|
||||
|
||||
# 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
|
||||
'
|
||||
|
||||
|
||||
# 27
|
||||
test_expect_success 'check split+rejoin' '
|
||||
spl1=''"$(git subtree split --annotate='"'*'"' --prefix subdir --onto FETCH_HEAD --message "Split & rejoin" --rejoin)"'' &&
|
||||
undo &&
|
||||
|
|
@ -258,7 +245,6 @@ test_expect_success 'check split+rejoin' '
|
|||
check_equal ''"$(last_commit_message)"'' "Split '"'"'subdir/'"'"' into commit '"'"'"$spl1"'"'"'"
|
||||
'
|
||||
|
||||
# 28
|
||||
test_expect_success 'add main-sub8' '
|
||||
create subdir/main-sub8 &&
|
||||
git commit -m "main-sub8"
|
||||
|
|
@ -267,14 +253,12 @@ test_expect_success 'add main-sub8' '
|
|||
# To the subproject!
|
||||
cd ./subproj
|
||||
|
||||
# 29
|
||||
test_expect_success 'merge split into subproj' '
|
||||
git fetch .. spl1 &&
|
||||
git branch spl1 FETCH_HEAD &&
|
||||
git merge FETCH_HEAD
|
||||
'
|
||||
|
||||
# 30
|
||||
test_expect_success 'add sub9' '
|
||||
create sub9 &&
|
||||
git commit -m "sub9"
|
||||
|
|
@ -283,19 +267,16 @@ test_expect_success 'add sub9' '
|
|||
# Back to mainline
|
||||
cd ..
|
||||
|
||||
# 31
|
||||
test_expect_success 'split for sub8' '
|
||||
split2=''"$(git subtree split --annotate='"'*'"' --prefix subdir/ --rejoin)"''
|
||||
git branch split2 "$split2"
|
||||
'
|
||||
|
||||
# 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"
|
||||
|
|
@ -304,7 +285,6 @@ test_expect_success 'split for sub10' '
|
|||
# To the subproject!
|
||||
cd ./subproj
|
||||
|
||||
# 34
|
||||
test_expect_success 'merge split into subproj' '
|
||||
git fetch .. spl3 &&
|
||||
git branch spl3 FETCH_HEAD &&
|
||||
|
|
@ -318,13 +298,11 @@ chkms_sub=$(echo $chkms | multiline | sed 's,^,subdir/,' | fixnl)
|
|||
chks="sub1 sub2 sub3 sub9"
|
||||
chks_sub=$(echo $chks | multiline | sed 's,^,subdir/,' | fixnl)
|
||||
|
||||
# 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"
|
||||
'
|
||||
|
||||
# 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"
|
||||
|
|
@ -333,20 +311,17 @@ test_expect_success 'make sure the subproj history *only* contains commits that
|
|||
# Back to mainline
|
||||
cd ..
|
||||
|
||||
# 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
|
||||
'
|
||||
|
||||
# 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"
|
||||
'
|
||||
|
||||
# 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
|
||||
|
|
@ -355,12 +330,10 @@ test_expect_success 'make sure each filename changed exactly once in the entire
|
|||
check_equal "$allchanges" ''"$(echo $chkms $chkm $chks $chkms_sub | multiline | sort | fixnl)"''
|
||||
'
|
||||
|
||||
# 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.*:")"'' ""
|
||||
|
|
@ -370,14 +343,12 @@ test_expect_success 'make sure no "git subtree" tagged commits make it into subp
|
|||
mkdir test2
|
||||
cd test2
|
||||
|
||||
# 42
|
||||
test_expect_success 'init main' '
|
||||
test_create_repo main
|
||||
'
|
||||
|
||||
cd main
|
||||
|
||||
# 43
|
||||
test_expect_success 'add main1' '
|
||||
create main1 &&
|
||||
git commit -m "main1"
|
||||
|
|
@ -385,14 +356,12 @@ test_expect_success 'add main1' '
|
|||
|
||||
cd ..
|
||||
|
||||
# 44
|
||||
test_expect_success 'init sub' '
|
||||
test_create_repo sub
|
||||
'
|
||||
|
||||
cd sub
|
||||
|
||||
# 45
|
||||
test_expect_success 'add sub2' '
|
||||
create sub2 &&
|
||||
git commit -m "sub2"
|
||||
|
|
@ -402,7 +371,6 @@ cd ../main
|
|||
|
||||
# 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 &&
|
||||
|
|
@ -411,7 +379,6 @@ test_expect_success 'add sub as subdir in main' '
|
|||
|
||||
cd ../sub
|
||||
|
||||
# 47
|
||||
test_expect_success 'add sub3' '
|
||||
create sub3 &&
|
||||
git commit -m "sub3"
|
||||
|
|
@ -419,20 +386,17 @@ test_expect_success 'add sub3' '
|
|||
|
||||
cd ../main
|
||||
|
||||
# 48
|
||||
test_expect_success 'merge from sub' '
|
||||
git fetch ../sub master &&
|
||||
git branch sub3 FETCH_HEAD &&
|
||||
git subtree merge --prefix subdir sub3
|
||||
'
|
||||
|
||||
# 49
|
||||
test_expect_success 'add main-sub4' '
|
||||
create subdir/main-sub4 &&
|
||||
git commit -m "main-sub4"
|
||||
'
|
||||
|
||||
# 50
|
||||
test_expect_success 'split for main-sub4 without --onto' '
|
||||
git subtree split --prefix subdir --branch mainsub4
|
||||
'
|
||||
|
|
@ -442,19 +406,16 @@ test_expect_success 'split for main-sub4 without --onto' '
|
|||
# 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,
|
||||
|
|
@ -487,7 +448,6 @@ joincommits()
|
|||
echo "$commit $all"
|
||||
}
|
||||
|
||||
# 54
|
||||
test_expect_success 'verify one file change per commit' '
|
||||
x= &&
|
||||
list=''"$(git log --pretty=format:'"'commit: %H'"' | joincommits)"'' &&
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче