diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-02-18 11:31:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-18 11:31:52 -0800 |
| commit | 25487f8e2ae266936df0f807ae79dca41606e404 (patch) | |
| tree | dcea5cb274c0618e742644b5cd7b0615202819b7 /t/t4013-diff-various.sh | |
| parent | 88e38808cd52aaed327a82d6a6ffdb8b9da621f2 (diff) | |
| parent | 91e80b984e0afda37d288e550fb5832d2b71568c (diff) | |
| download | git-25487f8e2ae266936df0f807ae79dca41606e404.tar.gz git-25487f8e2ae266936df0f807ae79dca41606e404.tar.xz | |
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/t4013-diff-various.sh')
| -rwxr-xr-x | t/t4013-diff-various.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index aba53202f..9c709022e 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 |