git-merge-one-file: do not worry about 'rmdir -p' not removing directory.

diff --git a/ssh-upload.c b/ssh-upload.c
index 603abcc8c3da9029a50fb7a2e76b0d6f70e2abeb..b675a0b1f1df7d313f8201d59ad25b1c3d53a2f4 100644 (file)
--- a/ssh-upload.c
+++ b/ssh-upload.c
@@ -121,6 +121,9 @@ int main(int argc, char **argv)
 
        prog = getenv(COUNTERPART_ENV_NAME);
        if (!prog) prog = COUNTERPART_PROGRAM_NAME;
+
+       setup_git_directory();
+
        while (arg < argc && argv[arg][0] == '-') {
                if (argv[arg][1] == 'w')
                        arg++;