From 6d0011947b0675de21e4010dedb14a94cd7f7873 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Fri, 7 Mar 2014 20:33:51 -0800 Subject: Use symbolic names for the git file types Instead of hardcoding the regular file mode (0100644 is the traditional Unix S_IFREG file mode with -rw-r--r-- protections), use GIT_FILEMODE_BLOB (and GIT_FILEMODE_TREE for 040000 - S_IFDIR). The numbers were historically indeed the regular S_IFREG/S_IFDIR values, but since those aren't portable, git ended up defining their own. Signed-off-by: Linus Torvalds Signed-off-by: Dirk Hohndel --- save-git.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/save-git.c b/save-git.c index 836b8e0a1..e2950d42c 100644 --- a/save-git.c +++ b/save-git.c @@ -464,7 +464,7 @@ static int blob_insert(git_repository *repo, struct dir *tree, struct membuffer return ret; VA_BUF(&name, fmt); - ret = tree_insert(tree->files, mb_cstring(&name), 1, &blob_id, 0100644); + ret = tree_insert(tree->files, mb_cstring(&name), 1, &blob_id, GIT_FILEMODE_BLOB); free_buffer(&name); return ret; } @@ -577,7 +577,7 @@ static int save_trip_description(git_repository *repo, struct dir *dir, dive_tri free_buffer(&desc); if (ret) return report_error("trip blob creation failed"); - ret = tree_insert(dir->files, "00-Trip", 0, &blob_id, 0100644); + ret = tree_insert(dir->files, "00-Trip", 0, &blob_id, GIT_FILEMODE_BLOB); if (ret) return report_error("trip description tree insert failed"); return 0; @@ -775,7 +775,7 @@ static int write_git_tree(git_repository *repo, struct dir *tree, git_oid *resul git_oid id; if (!write_git_tree(repo, subdir, &id)) - tree_insert(tree->files, subdir->name, subdir->unique, &id, 040000); + tree_insert(tree->files, subdir->name, subdir->unique, &id, GIT_FILEMODE_TREE); tree->subdirs = subdir->sibling; free(subdir); }; -- cgit v1.2.3-70-g09d2