diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-12-17 19:46:32 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-17 19:46:32 (GMT) |
| commit | 4d1826d1d96a4284ef268c6febeaa9fabfa75e9e (patch) | |
| tree | c19c924f1072120694cf8bb9283f1334e619d94d /t | |
| parent | aa13132d9068d77af0b1d8e2cfbf93cda4f09226 (diff) | |
| parent | 0a54f709057729d0aa9f1e767e4f201834f14834 (diff) | |
| download | git-4d1826d1d96a4284ef268c6febeaa9fabfa75e9e.zip git-4d1826d1d96a4284ef268c6febeaa9fabfa75e9e.tar.gz git-4d1826d1d96a4284ef268c6febeaa9fabfa75e9e.tar.bz2 | |
Merge branch 'fc/trivial'
* fc/trivial:
remote: fix status with branch...rebase=preserve
fetch: add missing documentation
t: trivial whitespace cleanups
abspath: trivial style fix
Diffstat (limited to 't')
| -rwxr-xr-x | t/t0002-gitfile.sh | 3 | ||||
| -rwxr-xr-x | t/t0003-attributes.sh | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/t/t0002-gitfile.sh b/t/t0002-gitfile.sh index cb14425..37e9396 100755 --- a/t/t0002-gitfile.sh +++ b/t/t0002-gitfile.sh @@ -7,7 +7,7 @@ Verify that plumbing commands work when .git is a file . ./test-lib.sh objpath() { - echo "$1" | sed -e 's|\(..\)|\1/|' + echo "$1" | sed -e 's|\(..\)|\1/|' } objck() { @@ -19,7 +19,6 @@ objck() { fi } - test_expect_success 'initial setup' ' REAL="$(pwd)/.real" && mv .git "$REAL" diff --git a/t/t0003-attributes.sh b/t/t0003-attributes.sh index 0b98b6f..b9d7947 100755 --- a/t/t0003-attributes.sh +++ b/t/t0003-attributes.sh @@ -13,7 +13,6 @@ attr_check () { test_line_count = 0 err } - test_expect_success 'setup' ' mkdir -p a/b/d a/c b && ( |