merge-file: handle empty files gracefully

diff --git a/receive-pack.c b/receive-pack.c
index 326749583221d0f5e81f58608a23ab1dc1601177..c90ec7dde28ec135f0c90e6c731b730ad4a1f7a8 100644 (file)
--- a/receive-pack.c
+++ b/receive-pack.c
@@ -469,6 +469,8 @@ int main(int argc, char **argv)
        if (!dir)
                usage(receive_pack_usage);
 
+       setup_path(NULL);
+
        if (!enter_repo(dir, 0))
                die("'%s': unable to chdir or not a git archive", dir);