sha1_file: teach packed_object_info about typename

diff --git a/builtin/commit.c b/builtin/commit.c
index da1ba4c86205ca55ae1880cb768b093b101bd85a..ef52457effc1f519a53c105efcb24d5e19048f6c 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1699,10 +1699,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
                if (!reflog_msg)
                        reflog_msg = "commit (merge)";
                pptr = commit_list_append(current_head, pptr);
-               fp = fopen(git_path_merge_head(), "r");
-               if (fp == NULL)
-                       die_errno(_("could not open '%s' for reading"),
-                                 git_path_merge_head());
+               fp = xfopen(git_path_merge_head(), "r");
                while (strbuf_getline_lf(&m, fp) != EOF) {
                        struct commit *parent;