Merge branch 'maint'

gitster · gitster · commit 3daff7c31998 · 2011-12-20T16:34:20.000-08:00
* maint:
  builtin/init-db.c: eliminate -Wformat warning on Solaris
diff --git a/builtin/init-db.c b/builtin/init-db.c
@@ -351,7 +351,7 @@ static void separate_git_dir(const char *git_dir)
 		else if (S_ISDIR(st.st_mode))
 			src = git_link;
 		else
-			die(_("unable to handle file type %d"), st.st_mode);
+			die(_("unable to handle file type %d"), (int)st.st_mode);
 
 		if (rename(src, git_dir))
 			die_errno(_("unable to move %s to %s"), src, git_dir);
