undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
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:
Junio C Hamano 2012-05-20 15:45:35 -07:00
commit adc7052bb6
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
t/t3404-rebase-interactive.sh
View File

@ -247,6 +247,7 @@ test_expect_success '-p handles "no changes" gracefully' '
' '
test_expect_failure 'exchange two commits with -p' ' test_expect_failure 'exchange two commits with -p' '
git checkout H &&
FAKE_LINES="2 1" git rebase -i -p HEAD~2 && FAKE_LINES="2 1" git rebase -i -p HEAD~2 &&
test H = $(git cat-file commit HEAD^ | sed -ne \$p) && test H = $(git cat-file commit HEAD^ | sed -ne \$p) &&
test G = $(git cat-file commit HEAD | sed -ne \$p) test G = $(git cat-file commit HEAD | sed -ne \$p)

4
t/t7408-submodule-reference.sh
View File

@ -28,7 +28,7 @@ git prune'
cd "$base_dir" cd "$base_dir"
test_expect_success 'preparing supermodule' \ test_expect_success 'preparing superproject' \
'test_create_repo super && cd super && 'test_create_repo super && cd super &&
echo file > file && echo file > file &&
git add file && git add file &&
@ -55,7 +55,7 @@ diff expected current'
cd "$base_dir" cd "$base_dir"
test_expect_success 'cloning supermodule' \ test_expect_success 'cloning superproject' \
'git clone super super-clone' 'git clone super super-clone'
cd "$base_dir" cd "$base_dir"

2
t/t9300-fast-import.sh
View File

@ -1657,7 +1657,7 @@ M 160000 :6 sub
INPUT_END INPUT_END
test_expect_success \ test_expect_success \
'P: supermodule & submodule mix' \ 'P: superproject & submodule mix' \
'git fast-import <input && 'git fast-import <input &&
git checkout subuse1 && git checkout subuse1 &&
rm -rf sub && mkdir sub && (cd sub && rm -rf sub && mkdir sub && (cd sub &&

2
unpack-trees.c
View File

@ -1210,7 +1210,7 @@ static int verify_uptodate_1(struct cache_entry *ce,
return 0; return 0;
/* /*
* NEEDSWORK: the current default policy is to allow * 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 * index. This needs to be tightened later for
* submodules that are marked to be automatically * submodules that are marked to be automatically
* checked out. * checked out.