checkout: keep most #include sorted

The include list becomes very long and frankly a bit unorganized. With
the exception of builtin.h, cache.h or git-compat-util.h which have to
come first, keep the rest sorted.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/checkout.c b/builtin/checkout.c
index f66bd2f56db77eadfe3c4f430bb4ca869e1fd1e1..15ee5181ebe758b6925abe1a06d7c653e6c3a928 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -1,30 +1,30 @@
 #define USE_THE_INDEX_COMPATIBILITY_MACROS
 #include "builtin.h"
 #define USE_THE_INDEX_COMPATIBILITY_MACROS
 #include "builtin.h"

-#include "config.h"
+#include "advice.h"
+#include "blob.h"
+#include "branch.h"
+#include "cache-tree.h"

 #include "checkout.h"
 #include "checkout.h"

+#include "commit.h"
+#include "config.h"
+#include "diff.h"
+#include "dir.h"
+#include "ll-merge.h"

 #include "lockfile.h"
 #include "lockfile.h"

+#include "merge-recursive.h"
+#include "object-store.h"

 #include "parse-options.h"
 #include "refs.h"
 #include "parse-options.h"
 #include "refs.h"

-#include "object-store.h"
-#include "commit.h"
+#include "remote.h"
+#include "resolve-undo.h"
+#include "revision.h"
+#include "run-command.h"
+#include "submodule.h"
+#include "submodule-config.h"

 #include "tree.h"
 #include "tree-walk.h"
 #include "tree.h"
 #include "tree-walk.h"

-#include "cache-tree.h"

 #include "unpack-trees.h"
 #include "unpack-trees.h"

-#include "dir.h"
-#include "run-command.h"
-#include "merge-recursive.h"
-#include "branch.h"
-#include "diff.h"
-#include "revision.h"
-#include "remote.h"
-#include "blob.h"

 #include "xdiff-interface.h"
 #include "xdiff-interface.h"

-#include "ll-merge.h"
-#include "resolve-undo.h"
-#include "submodule-config.h"
-#include "submodule.h"
-#include "advice.h"

 
 static int checkout_optimize_new_branch;
 
 
 static int checkout_optimize_new_branch;