git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 06/20] contrib/examples/git-resolve.sh: avoid "test <cond> -a/-o <cond>"

From
Elia Pinto <gitter.spiros@gmail.com>
Date
Jun 6, 2014, 14:55 UTC
Message-ID
<1402066563-28519-7-git-send-email-gitter.spiros@gmail.com>
In-Reply-To
<1402066563-28519-1-git-send-email-gitter.spiros@gmail.com>

The construct is error-prone; "test" being built-in in most modern shells, the reason to avoid "test <cond> && test <cond>" spawning one extra process by using a single "test <cond> -a <cond>" no longer exists.

Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
---
 contrib/examples/git-resolve.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/examples/git-resolve.sh b/contrib/examples/git-resolve.sh
index 48d0fc9..70fdc27 100755
--- a/contrib/examples/git-resolve.sh
+++ b/contrib/examples/git-resolve.sh
@@ -76,7 +76,7 @@ case "$common" in
 			2>/dev/null || continue
 		# Count the paths that are unmerged.
 		cnt=$(GIT_INDEX_FILE=$G git ls-files --unmerged | wc -l)
-		if test $best_cnt -le 0 -o $cnt -le $best_cnt
+		if test $best_cnt -le 0 || test $cnt -le $best_cnt
 		then
 			best=$c
 			best_cnt=$cnt

-- 
1.7.10.4
Previous: David AguilarNext: Elia Pinto
Message 10 of 35 in “avoid "test <cond> -a/-o <cond>"”
  1. 00/20 avoid "test <cond> -a/-o <cond>"Elia Pinto, Jun 6, 2014
  2. 01/20 check_bindir: avoid "test <cond> -a/-o <cond>"Elia Pinto, Jun 6, 2014
  3. 02/20 contrib/examples/git-clone.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto, Jun 6, 2014
  4. Junio C HamanoJun 9, 2014
  5. 03/20 contrib/examples/git-commit.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto, Jun 6, 2014
  6. David AguilarJun 10, 2014
  7. 04/20 contrib/examples/git-merge.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto, Jun 6, 2014
  8. 05/20 contrib/examples/git-repack.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto, Jun 6, 2014
  9. David AguilarJun 10, 2014
  10. 06/20 contrib/examples/git-resolve.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto, Jun 6, 2014
  11. 07/20 git-bisect.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto, Jun 6, 2014
  12. 08/20 git-mergetool.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto, Jun 6, 2014
  13. David AguilarJun 10, 2014
  14. 09/20 git-rebase--interactive.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto, Jun 6, 2014
  15. David AguilarJun 10, 2014
  16. 10/20 git-submodule.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto, Jun 6, 2014
  17. Junio C HamanoJun 9, 2014
  18. Johannes SixtJun 10, 2014
  19. Johannes SixtJun 10, 2014
  20. 11/20 t/lib-httpd.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto, Jun 6, 2014
  21. 12/20 t/t0025-crlf-auto.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto, Jun 6, 2014
  22. 13/20 t/t0026-eol-config.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto, Jun 6, 2014
  23. 14/20 t/t4102-apply-rename.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto, Jun 6, 2014
  24. 15/20 t/t5000-tar-tree.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto, Jun 6, 2014
  25. David AguilarJun 10, 2014
  26. David AguilarJun 10, 2014
  27. David AguilarJun 10, 2014
  28. René ScharfeJun 10, 2014
  29. 16/20 t/t5403-post-checkout-hook.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto, Jun 6, 2014
  30. 17/20 t/t5538-push-shallow.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto, Jun 6, 2014
  31. 18/20 t/t9814-git-p4-rename.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto, Jun 6, 2014
  32. 19/20 t/test-lib-functions.sh: avoid "test <cond> -a/-o <cond>"Elia Pinto, Jun 6, 2014
  33. 20/20 CodingGuidelines: avoid "test <cond> -a/-o <cond>"Elia Pinto, Jun 6, 2014
  34. Torsten BögershausenJun 6, 2014
  35. Matthieu MoyJun 9, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.