Merge fixes up to GIT 1.0.4

diff --git a/convert-objects.c b/convert-objects.c
index 073cab592fba81c97e6f13d660b0329a42427ef0..b49bce2681caec6cf6ea008aae6d9c58fff60639 100644 (file)
--- a/convert-objects.c
+++ b/convert-objects.c
@@ -1,7 +1,6 @@
-#define _XOPEN_SOURCE /* glibc2 needs this */
-#define __EXTENSIONS__ /* solaris needs this */
+#define _XOPEN_SOURCE 500 /* glibc2 and AIX 5.3L need this */
+#define _XOPEN_SOURCE_EXTENDED 1 /* AIX 5.3L needs this */
 #include <time.h>
-#include <ctype.h>
 #include "cache.h"
 
 struct entry {
@@ -318,6 +317,8 @@ int main(int argc, char **argv)
        unsigned char sha1[20];
        struct entry *entry;
 
+       setup_git_directory();
+
        if (argc != 2 || get_sha1(argv[1], sha1))
                usage("git-convert-objects <sha1>");