Make update-cache be explicit about failed open() when doing

[git.git] / commit-tree.c

diff --git a/commit-tree.c b/commit-tree.c
index 0c568d0..b8dd36f 100644 (file)
--- a/commit-tree.c
+++ b/commit-tree.c
@@ -123,7 +123,7 @@ int main(int argc, char **argv)
        for (i = 2; i < argc; i += 2) {
                char *a, *b;
                a = argv[i]; b = argv[i+1];
-               if (!b || strcmp(a, "-p") || get_sha1_hex(b, parent_sha1[parents]))
+               if (!b || strcmp(a, "-p") || get_sha1(b, parent_sha1[parents]))
                        usage(commit_tree_usage);
                check_valid(parent_sha1[parents], "commit");
                parents++;
@@ -146,11 +146,11 @@ int main(int argc, char **argv)
        datestamp(realdate, sizeof(realdate));
        strcpy(date, realdate);
 
-       commitgecos = getenv("COMMIT_AUTHOR_NAME") ? : realgecos;
-       commitemail = getenv("COMMIT_AUTHOR_EMAIL") ? : realemail;
-       gecos = getenv("AUTHOR_NAME") ? : realgecos;
-       email = getenv("AUTHOR_EMAIL") ? : realemail;
-       audate = getenv("AUTHOR_DATE");
+       commitgecos = gitenv("GIT_COMMITTER_NAME") ? : realgecos;
+       commitemail = gitenv("GIT_COMMITTER_EMAIL") ? : realemail;
+       gecos = gitenv("GIT_AUTHOR_NAME") ? : realgecos;
+       email = gitenv("GIT_AUTHOR_EMAIL") ? : realemail;
+       audate = gitenv("GIT_AUTHOR_DATE");
        if (audate)
                parse_date(audate, date, sizeof(date));