diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-28 20:26:55 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-28 20:26:55 +0100 |
| commit | f3bb8b4b8452f1b7add220e787ef56c737ceff6a (patch) | |
| tree | 9560624c57a06e0a1c24b7e44a9e8ebb9daaab91 /t/t1020-subdirectory.sh | |
| parent | Merge branch 'rj/maint-difftool-cygwin-workaround' (diff) | |
| parent | setup_work_tree: adjust relative $GIT_WORK_TREE after moving cwd (diff) | |
| download | git-f3bb8b4b8452f1b7add220e787ef56c737ceff6a.tar.xz git-f3bb8b4b8452f1b7add220e787ef56c737ceff6a.zip | |
Merge branch 'nd/setup'
* nd/setup: (47 commits)
setup_work_tree: adjust relative $GIT_WORK_TREE after moving cwd
git.txt: correct where --work-tree path is relative to
Revert "Documentation: always respect core.worktree if set"
t0001: test git init when run via an alias
Remove all logic from get_git_work_tree()
setup: rework setup_explicit_git_dir()
setup: clean up setup_discovered_git_dir()
t1020-subdirectory: test alias expansion in a subdirectory
setup: clean up setup_bare_git_dir()
setup: limit get_git_work_tree()'s to explicit setup case only
Use git_config_early() instead of git_config() during repo setup
Add git_config_early()
git-rev-parse.txt: clarify --git-dir
t1510: setup case #31
t1510: setup case #30
t1510: setup case #29
t1510: setup case #28
t1510: setup case #27
t1510: setup case #26
t1510: setup case #25
...
Diffstat (limited to 't/t1020-subdirectory.sh')
| -rwxr-xr-x | t/t1020-subdirectory.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t1020-subdirectory.sh b/t/t1020-subdirectory.sh index a3ac33801a..1fd187c5eb 100755 --- a/t/t1020-subdirectory.sh +++ b/t/t1020-subdirectory.sh @@ -110,6 +110,14 @@ test_expect_success 'read-tree' ' ) ' +test_expect_success 'alias expansion' ' + ( + git config alias.ss status && + cd dir && + git status && + git ss + ) +' test_expect_success 'no file/rev ambiguity check inside .git' ' git commit -a -m 1 && ( |