зеркало из https://github.com/microsoft/git.git
Merge branch 'maint'
By Jens Lehmann (1) and Johannes Sixt (1) * maint: Consistently use "superproject" instead of "supermodule" t3404: begin "exchange commits with -p" test with correct preconditions
This commit is contained in:
Коммит
adc7052bb6
|
@ -247,6 +247,7 @@ test_expect_success '-p handles "no changes" gracefully' '
|
|||
'
|
||||
|
||||
test_expect_failure 'exchange two commits with -p' '
|
||||
git checkout H &&
|
||||
FAKE_LINES="2 1" git rebase -i -p HEAD~2 &&
|
||||
test H = $(git cat-file commit HEAD^ | sed -ne \$p) &&
|
||||
test G = $(git cat-file commit HEAD | sed -ne \$p)
|
||||
|
|
|
@ -28,7 +28,7 @@ git prune'
|
|||
|
||||
cd "$base_dir"
|
||||
|
||||
test_expect_success 'preparing supermodule' \
|
||||
test_expect_success 'preparing superproject' \
|
||||
'test_create_repo super && cd super &&
|
||||
echo file > file &&
|
||||
git add file &&
|
||||
|
@ -55,7 +55,7 @@ diff expected current'
|
|||
|
||||
cd "$base_dir"
|
||||
|
||||
test_expect_success 'cloning supermodule' \
|
||||
test_expect_success 'cloning superproject' \
|
||||
'git clone super super-clone'
|
||||
|
||||
cd "$base_dir"
|
||||
|
|
|
@ -1657,7 +1657,7 @@ M 160000 :6 sub
|
|||
INPUT_END
|
||||
|
||||
test_expect_success \
|
||||
'P: supermodule & submodule mix' \
|
||||
'P: superproject & submodule mix' \
|
||||
'git fast-import <input &&
|
||||
git checkout subuse1 &&
|
||||
rm -rf sub && mkdir sub && (cd sub &&
|
||||
|
|
|
@ -1210,7 +1210,7 @@ static int verify_uptodate_1(struct cache_entry *ce,
|
|||
return 0;
|
||||
/*
|
||||
* NEEDSWORK: the current default policy is to allow
|
||||
* submodule to be out of sync wrt the supermodule
|
||||
* submodule to be out of sync wrt the superproject
|
||||
* index. This needs to be tightened later for
|
||||
* submodules that are marked to be automatically
|
||||
* checked out.
|
||||
|
|
Загрузка…
Ссылка в новой задаче