Merge branch 'en/abort-df-conflict-fixes'

diff --git a/common-main.c b/common-main.c
index b989e136b5df3736ae8e14264b9738df204f91e8..3728f66b4cce80d298aab0e551a2d3c03e2c4357 100644 (file)
--- a/common-main.c
+++ b/common-main.c
@@ -32,14 +32,14 @@ int main(int argc, const char **argv)
         */
        sanitize_stdfds();
 
+       git_resolve_executable_dir(argv[0]);
+
        git_setup_gettext();
 
        initialize_the_repository();
 
        attr_start();
 
-       git_extract_argv0_path(argv[0]);
-
        restore_sigpipe_to_default();
 
        return cmd_main(argc, argv);