[PATCH] Correct show-diff output for deleted files

[git.git] / read-cache.c

diff --git a/read-cache.c b/read-cache.c
index 51403ce..5453694 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -12,10 +12,12 @@ unsigned int active_nr = 0, active_alloc = 0;
 void usage(const char *err, ...)
 {
        va_list args;
+       char string[200];
 
        va_start(args, err);
-       vfprintf(stderr, err, args);
+       vsnprintf(string, sizeof(string), err, args);
        va_end(args);
+       fprintf(stderr, "%s\n", string);
        exit(1);
 }
 
@@ -362,7 +364,7 @@ int read_cache(void)
                sha1_file_directory = DEFAULT_DB_ENVIRONMENT;
        if (access(sha1_file_directory, X_OK) < 0)
                return error("no access to SHA1 file directory");
-       fd = open(".dircache/index", O_RDONLY);
+       fd = open(".git/index", O_RDONLY);
        if (fd < 0)
                return (errno == ENOENT) ? 0 : error("open failed");