Merge in xdiff cleanup pieces

diff --git a/cat-file.c b/cat-file.c
index 1a613f3ee5ab4197fe18355ae65f2c9226b348cf..628f6cada89431acd23d612f7e0b10649348e088 100644 (file)
--- a/cat-file.c
+++ b/cat-file.c
@@ -5,6 +5,8 @@
  */
 #include "cache.h"
 #include "exec_cmd.h"
+#include "tag.h"
+#include "tree.h"
 
 static void flush_buffer(const char *buf, unsigned long size)
 {
@@ -100,6 +102,7 @@ int main(int argc, char **argv)
        int opt;
 
        setup_git_directory();
+       git_config(git_default_config);
        if (argc != 3 || get_sha1(argv[2], sha1))
                usage("git-cat-file [-t|-s|-e|-p|<type>] <sha1>");
 
@@ -135,13 +138,13 @@ int main(int argc, char **argv)
                        die("Not a valid object name %s", argv[2]);
 
                /* custom pretty-print here */
-               if (!strcmp(type, "tree"))
+               if (!strcmp(type, tree_type))
                        return execl_git_cmd("ls-tree", argv[2], NULL);
 
                buf = read_sha1_file(sha1, type, &size);
                if (!buf)
                        die("Cannot read object %s", argv[2]);
-               if (!strcmp(type, "tag"))
+               if (!strcmp(type, tag_type))
                        return pprint_tag(sha1, buf, size);
 
                /* otherwise just spit out the data */