diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-05-20 15:45:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-20 15:45:35 -0700 |
| commit | adc7052bb6e737cec0c6702f8dde259540eab672 (patch) | |
| tree | 9a3bfa9ff1389908213adcbddedfa09bf8b88c7b /t | |
| parent | Merge git://github.com/git-l10n/git-po (diff) | |
| parent | Consistently use "superproject" instead of "supermodule" (diff) | |
| download | tgif-adc7052bb6e737cec0c6702f8dde259540eab672.tar.xz | |
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
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 1 | ||||
| -rwxr-xr-x | t/t7408-submodule-reference.sh | 4 | ||||
| -rwxr-xr-x | t/t9300-fast-import.sh | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 4983bd7775..025c1c610e 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -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) diff --git a/t/t7408-submodule-reference.sh b/t/t7408-submodule-reference.sh index a45fadc58e..b770b2f04d 100755 --- a/t/t7408-submodule-reference.sh +++ b/t/t7408-submodule-reference.sh @@ -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" diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index 7da0e8da7b..2aa1824a94 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -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 && |