diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-06-25 23:22:00 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-25 23:22:00 +0400 |
| commit | b30adaac5238a611f12c407912b75112ad4cf186 (patch) | |
| tree | 595abd7809c349c9a3791583c698af6de25b7a72 /t | |
| parent | b7ce583682e26910c98e71d55babd2ed23a006ad (diff) | |
| parent | c0562611c525bb3c564b79c345fc7e4f9e799e54 (diff) | |
Merge branch 'nd/init-restore-env'
Some subcommands do not want to be aliased because of the side
effects that happens while the definitions of the aliases are looked
up from configuration system.
* nd/init-restore-env:
git potty: restore environments after alias expansion
Diffstat (limited to 't')
| -rwxr-xr-x | t/t0001-init.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t0001-init.sh b/t/t0001-init.sh index 2f3020342a..e62c0ffbc2 100755 --- a/t/t0001-init.sh +++ b/t/t0001-init.sh @@ -56,7 +56,7 @@ test_expect_success 'plain through aliased command, outside any git repo' ' check_config plain-aliased/.git false unset ' -test_expect_failure 'plain nested through aliased command' ' +test_expect_success 'plain nested through aliased command' ' ( git init plain-ancestor-aliased && cd plain-ancestor-aliased && @@ -68,7 +68,7 @@ test_expect_failure 'plain nested through aliased command' ' check_config plain-ancestor-aliased/plain-nested/.git false unset ' -test_expect_failure 'plain nested in bare through aliased command' ' +test_expect_success 'plain nested in bare through aliased command' ' ( git init --bare bare-ancestor-aliased.git && cd bare-ancestor-aliased.git && |