summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-21 00:34:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-12-21 00:34:20 (GMT)
commit3daff7c31998faedbe0dd7e2b8651e351be40d64 (patch)
tree874039c5b8eeb1a45b20e1387424d5e92806ff0d /builtin
parent8d68493f20db71abeb77adc251b2a116fe45cdaa (diff)
parent97f261b1e7f1af54aed700e61cdb8af74dbd2459 (diff)
downloadgit-3daff7c31998faedbe0dd7e2b8651e351be40d64.zip
git-3daff7c31998faedbe0dd7e2b8651e351be40d64.tar.gz
git-3daff7c31998faedbe0dd7e2b8651e351be40d64.tar.bz2
Merge branch 'maint'
* maint: builtin/init-db.c: eliminate -Wformat warning on Solaris
Diffstat (limited to 'builtin')
-rw-r--r--builtin/init-db.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/init-db.c b/builtin/init-db.c
index d07554c..0dacb8b 100644
--- 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);