diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-04-12 19:17:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-12 19:17:51 -0700 |
| commit | f43e2fd43b50d5a82a34bb3e4f848cb38bf93b7f (patch) | |
| tree | b29df95a9ea15dc54263921f63077c62058d6c22 /t | |
| parent | a53f2ec617ba36a67bf8794d28d666d45ce374a6 (diff) | |
| parent | 02604e293a3b7d48b0ce4e34149de8dc89c674e5 (diff) | |
| download | git-f43e2fd43b50d5a82a34bb3e4f848cb38bf93b7f.tar.gz git-f43e2fd43b50d5a82a34bb3e4f848cb38bf93b7f.tar.xz | |
Merge branch 'maint'
* maint:
t7401: squelch garbage output
Documentation/git-submodule: typofix
Fix config key miscount in url.*.insteadOf
Docs gitk: Explicitly mention the files that gitk uses (~/.gitk)
Document -w option to shortlog
bisect: report bad rev better
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5516-fetch-push.sh | 8 | ||||
| -rwxr-xr-x | t/t7401-submodule-summary.sh | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh index 793ffc660..6d7e73854 100755 --- a/t/t5516-fetch-push.sh +++ b/t/t5516-fetch-push.sh @@ -103,9 +103,9 @@ test_expect_success 'fetch with wildcard' ' test_expect_success 'fetch with insteadOf' ' mk_empty && ( - TRASH=$(pwd) && + TRASH=$(pwd)/ && cd testrepo && - git config url./$TRASH/.insteadOf trash/ + git config url.$TRASH.insteadOf trash/ git config remote.up.url trash/. && git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" && git fetch up && @@ -145,8 +145,8 @@ test_expect_success 'push with wildcard' ' test_expect_success 'push with insteadOf' ' mk_empty && - TRASH=$(pwd) && - git config url./$TRASH/.insteadOf trash/ && + TRASH=$(pwd)/ && + git config url.$TRASH.insteadOf trash/ && git push trash/testrepo refs/heads/master:refs/remotes/origin/master && ( cd testrepo && diff --git a/t/t7401-submodule-summary.sh b/t/t7401-submodule-summary.sh index 0f3c42ab3..b9a22190e 100755 --- a/t/t7401-submodule-summary.sh +++ b/t/t7401-submodule-summary.sh @@ -30,7 +30,7 @@ commit_file () { } test_create_repo sm1 && -add_file . foo +add_file . foo >/dev/null head1=$(add_file sm1 foo1 foo2) |