[PATCH v3 2/4] sha1_file: reorder code in prepare_packed_git_one()

[Nguyễn Thái Ngọc Duy]

The current loop does

        while (...) {
                if (!not .idx file)
                        continue;
                process .idx file;
        }

and is reordered to

        while (...) {
                if (!.idx file) {
                        process .idx file;
                }
        }

This makes it easier to add new extension file processing.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclo...@gmail.com>
---
 sha1_file.c | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/sha1_file.c b/sha1_file.c
index 40b2329..8d7da1d 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -1024,27 +1024,28 @@ static void prepare_packed_git_one(char *objdir, int 
local)
                int namelen = strlen(de->d_name);
                struct packed_git *p;
 
-               if (!has_extension(de->d_name, ".idx"))
-                       continue;
-
                if (len + namelen + 1 > sizeof(path))
                        continue;
 
-               /* Don't reopen a pack we already have. */
                strcpy(path + len, de->d_name);
-               for (p = packed_git; p; p = p->next) {
-                       if (!memcmp(path, p->pack_name, len + namelen - 4))
-                               break;
+
+               if (has_extension(de->d_name, ".idx")) {
+                       /* Don't reopen a pack we already have. */
+                       for (p = packed_git; p; p = p->next) {
+                               if (!memcmp(path, p->pack_name, len + namelen - 
4))
+                                       break;
+                       }
+                       if (p)
+                               continue;
+                       /*
+                        * See if it really is a valid .idx file with
+                        * corresponding .pack file that we can map.
+                        */
+                       p = add_packed_git(path, len + namelen, local);
+                       if (!p)
+                               continue;
+                       install_packed_git(p);
                }
-               if (p)
-                       continue;
-               /* See if it really is a valid .idx file with corresponding
-                * .pack file that we can map.
-                */
-               p = add_packed_git(path, len + namelen, local);
-               if (!p)
-                       continue;
-               install_packed_git(p);
        }
        closedir(dir);
 }
-- 
1.8.1.2.536.gf441e6d

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html