Merge branch 'jk/ident-loosen-getpwuid' into maint

diff --git a/t/t3403-rebase-skip.sh b/t/t3403-rebase-skip.sh
index 826500bd18a520a37e3490b9deeca94fb9e14405..3968020e648091e907fde6efe9aeb5ce66753670 100755 (executable)
--- a/t/t3403-rebase-skip.sh
+++ b/t/t3403-rebase-skip.sh
@@ -64,10 +64,11 @@ test_expect_success 'rebase with --merge' '
 
 test_expect_success 'rebase --skip with --merge' '
        git rebase --skip
-       '
+'
 
-test_expect_success 'merge and reference trees equal' \
-       'test -z "`git diff-tree skip-merge skip-reference`"'
+test_expect_success 'merge and reference trees equal' '
+       test -z "`git diff-tree skip-merge skip-reference`"
+'
 
 test_expect_success 'moved back to branch correctly' '
        test refs/heads/skip-merge = $(git symbolic-ref HEAD)