diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-02-18 19:31:52 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-18 19:31:52 (GMT) |
| commit | 25487f8e2ae266936df0f807ae79dca41606e404 (patch) | |
| tree | dcea5cb274c0618e742644b5cd7b0615202819b7 /t | |
| parent | 88e38808cd52aaed327a82d6a6ffdb8b9da621f2 (diff) | |
| parent | 91e80b984e0afda37d288e550fb5832d2b71568c (diff) | |
| download | git-25487f8e2ae266936df0f807ae79dca41606e404.zip git-25487f8e2ae266936df0f807ae79dca41606e404.tar.gz git-25487f8e2ae266936df0f807ae79dca41606e404.tar.bz2 | |
Merge branch 'maint'
* maint:
tests: fix "export var=val"
Skip timestamp differences for diff --no-index
Documentation/git-push: --all, --mirror, --tags can not be combined
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4013-diff-various.sh | 5 | ||||
| -rw-r--r-- | t/t4013/diff.diff_--no-index_dir_dir3 | 2 | ||||
| -rwxr-xr-x | t/t9301-fast-export.sh | 4 | ||||
| -rw-r--r-- | t/test-lib.sh | 2 |
4 files changed, 10 insertions, 3 deletions
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index aba5320..9c70902 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -74,6 +74,10 @@ test_expect_success setup ' for i in 1 2; do echo $i; done >>dir/sub && git update-index file0 dir/sub && + mkdir dir3 && + cp dir/sub dir3/sub && + test-chmtime +1 dir3/sub && + git config log.showroot false && git commit --amend && git show-branch @@ -262,6 +266,7 @@ diff --patch-with-raw -r initial..side diff --name-status dir2 dir diff --no-index --name-status dir2 dir diff --no-index --name-status -- dir2 dir +diff --no-index dir dir3 diff master master^ side EOF diff --git a/t/t4013/diff.diff_--no-index_dir_dir3 b/t/t4013/diff.diff_--no-index_dir_dir3 new file mode 100644 index 0000000..2142c2b --- /dev/null +++ b/t/t4013/diff.diff_--no-index_dir_dir3 @@ -0,0 +1,2 @@ +$ git diff --no-index dir dir3 +$ diff --git a/t/t9301-fast-export.sh b/t/t9301-fast-export.sh index 9985721..86c3760 100755 --- a/t/t9301-fast-export.sh +++ b/t/t9301-fast-export.sh @@ -185,8 +185,8 @@ test_expect_success 'submodule fast-export | fast-import' ' ' -export GIT_AUTHOR_NAME='A U Thor' -export GIT_COMMITTER_NAME='C O Mitter' +GIT_AUTHOR_NAME='A U Thor'; export GIT_AUTHOR_NAME +GIT_COMMITTER_NAME='C O Mitter'; export GIT_COMMITTER_NAME test_expect_success 'setup copies' ' diff --git a/t/test-lib.sh b/t/test-lib.sh index 6f6244a..0c45592 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -82,7 +82,7 @@ do -i|--i|--im|--imm|--imme|--immed|--immedi|--immedia|--immediat|--immediate) immediate=t; shift ;; -l|--l|--lo|--lon|--long|--long-|--long-t|--long-te|--long-tes|--long-test|--long-tests) - export GIT_TEST_LONG=t; shift ;; + GIT_TEST_LONG=t; export GIT_TEST_LONG; shift ;; -h|--h|--he|--hel|--help) help=t; shift ;; -v|--v|--ve|--ver|--verb|--verbo|--verbos|--verbose) |