checkout: prevent losing staged changes with --merge

diff --git a/common-main.c b/common-main.c
index 3be5ad18e1d07fe9dad4b2d9df37a619bd175a33..d484aec20979ac9a1ea6d49b166f51436a24dfad 100644 (file)
--- a/common-main.c
+++ b/common-main.c
@@ -1,5 +1,6 @@
 #include "cache.h"
-#include "exec_cmd.h"
+#include "exec-cmd.h"
+#include "attr.h"
 
 /*
  * Many parts of Git have subprograms communicate via pipe, expect the
@@ -22,13 +23,9 @@ static void restore_sigpipe_to_default(void)
        signal(SIGPIPE, SIG_DFL);
 }
 
-int main(int argc, char **av)
+int main(int argc, const char **argv)
 {
-       /*
-        * This const trickery is explained in
-        * 84d32bf7678259c08406571cd6ce4b7a6724dcba
-        */
-       const char **argv = (const char **)av;
+       int result;
 
        /*
         * Always open file descriptors 0/1/2 to avoid clobbering files
@@ -36,12 +33,23 @@ int main(int argc, char **av)
         * onto stdin/stdout/stderr in the child processes we spawn.
         */
        sanitize_stdfds();
+       restore_sigpipe_to_default();
+
+       trace2_initialize();
+       trace2_cmd_start(argv);
+       trace2_collect_process_info();
+
+       git_resolve_executable_dir(argv[0]);
 
        git_setup_gettext();
 
-       argv[0] = git_extract_argv0_path(argv[0]);
+       initialize_the_repository();
 
-       restore_sigpipe_to_default();
+       attr_start();
+
+       result = cmd_main(argc, argv);
+
+       trace2_cmd_exit(result);
 
-       return cmd_main(argc, argv);
+       return result;
 }