This file was edited by applying: expand -i | unexpand --first-only | sed "s/ *$//" to the file. No change to test outputs or status code was observed. Signed-off-by: Jon Seymour <jon.seymour@xxxxxxxxx> --- t/t3200-branch.sh | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 9e69c8c..67d683d 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -65,30 +65,30 @@ test_expect_success \ test_expect_success \ 'git branch j/k should work after branch j has been deleted' \ 'git branch j && - git branch -d j && - git branch j/k' + git branch -d j && + git branch j/k' test_expect_success \ 'git branch l should work after branch l/m has been deleted' \ 'git branch l/m && - git branch -d l/m && - git branch l' + git branch -d l/m && + git branch l' test_expect_success \ 'git branch -m m m/m should work' \ 'git branch -l m && - git branch -m m m/m && - test -f .git/logs/refs/heads/m/m' + git branch -m m m/m && + test -f .git/logs/refs/heads/m/m' test_expect_success \ 'git branch -m n/n n should work' \ 'git branch -l n/n && - git branch -m n/n n - test -f .git/logs/refs/heads/n' + git branch -m n/n n + test -f .git/logs/refs/heads/n' test_expect_success 'git branch -m o/o o should fail when o/p exists' ' git branch o/o && - git branch o/p && + git branch o/p && test_must_fail git branch -m o/o o ' @@ -112,12 +112,12 @@ git config branch.s/s.dummy Hello test_expect_success \ 'git branch -m s/s s should work when s/t is deleted' \ 'git branch -l s/s && - test -f .git/logs/refs/heads/s/s && - git branch -l s/t && - test -f .git/logs/refs/heads/s/t && - git branch -d s/t && - git branch -m s/s s && - test -f .git/logs/refs/heads/s' + test -f .git/logs/refs/heads/s/s && + git branch -l s/t && + test -f .git/logs/refs/heads/s/t && + git branch -d s/t && + git branch -m s/s s && + test -f .git/logs/refs/heads/s' test_expect_success 'config information was renamed, too' \ "test $(git config branch.s.dummy) = Hello && -- 1.7.6.362.gf0e6 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html