These patch series convert test -a/-o to && and ||. This is the the third version. Changes: - Change the commit message for consistency with the comment to the patch to the CodingGuideline (Junio proposed patch http://www.spinics.net/lists/git/msg232199.html) expressing even better the meaning of the patches ( in particular, the phrase "Better known" vs. "error prone"). The previous comment was "convert test -a/-o to && and ||" - Therefore also includes the Julio patch to the CodingGuideline I have done the rebase with "master" and the patches also apply to "next". I hope I have done the right thing in resending the patch series. I am Sorry if not. Elia Pinto (20): check_bindir: avoid "test <cond> -a/-o <cond>" contrib/examples/git-clone.sh: avoid "test <cond> -a/-o <cond>" contrib/examples/git-commit.sh: avoid "test <cond> -a/-o <cond>" contrib/examples/git-merge.sh: avoid "test <cond> -a/-o <cond>" contrib/examples/git-repack.sh: avoid "test <cond> -a/-o <cond>" contrib/examples/git-resolve.sh: avoid "test <cond> -a/-o <cond>" git-bisect.sh: avoid "test <cond> -a/-o <cond>" git-mergetool.sh: avoid "test <cond> -a/-o <cond>" git-rebase--interactive.sh: avoid "test <cond> -a/-o <cond>" git-submodule.sh: avoid "test <cond> -a/-o <cond>" t/lib-httpd.sh: avoid "test <cond> -a/-o <cond>" t/t0025-crlf-auto.sh: avoid "test <cond> -a/-o <cond>" t/t0026-eol-config.sh: avoid "test <cond> -a/-o <cond>" t/t4102-apply-rename.sh: avoid "test <cond> -a/-o <cond>" t/t5000-tar-tree.sh: avoid "test <cond> -a/-o <cond>" t/t5403-post-checkout-hook.sh: avoid "test <cond> -a/-o <cond>" t/t5538-push-shallow.sh: avoid "test <cond> -a/-o <cond>" t/t9814-git-p4-rename.sh: avoid "test <cond> -a/-o <cond>" t/test-lib-functions.sh: avoid "test <cond> -a/-o <cond>" CodingGuidelines: avoid "test <cond> -a/-o <cond>" Documentation/CodingGuidelines | 12 ++++++++++++ check_bindir | 2 +- contrib/examples/git-clone.sh | 2 +- contrib/examples/git-commit.sh | 4 ++-- contrib/examples/git-merge.sh | 4 ++-- contrib/examples/git-repack.sh | 4 ++-- contrib/examples/git-resolve.sh | 2 +- git-bisect.sh | 2 +- git-mergetool.sh | 4 ++-- git-rebase--interactive.sh | 2 +- git-submodule.sh | 32 ++++++++++++++++++++------------ t/lib-httpd.sh | 2 +- t/t0025-crlf-auto.sh | 6 +++--- t/t0026-eol-config.sh | 8 ++++---- t/t4102-apply-rename.sh | 2 +- t/t5000-tar-tree.sh | 2 +- t/t5403-post-checkout-hook.sh | 8 ++++---- t/t5538-push-shallow.sh | 2 +- t/t9814-git-p4-rename.sh | 4 ++-- t/test-lib-functions.sh | 4 ++-- 20 files changed, 64 insertions(+), 44 deletions(-) -- 1.7.10.4 -- 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