Merge branch 'master' into lt/logopt

diff --git a/exec_cmd.c b/exec_cmd.c
index 96cc2123b642173bbf7ff38cbea46695357b2c0b..590e738969ecfdd7ff2f23da36cdac917215313d 100644 (file)
--- a/exec_cmd.c
+++ b/exec_cmd.c
@@ -37,7 +37,7 @@ int execv_git_cmd(const char **argv)
                                getenv("GIT_EXEC_PATH"),
                                builtin_exec_path };
 
-       for (i = 0; i < sizeof(paths)/sizeof(paths[0]); ++i) {
+       for (i = 0; i < ARRAY_SIZE(paths); ++i) {
                const char *exec_dir = paths[i];
                const char *tmp;