Suggest use of "git add file1 file2" when there is nothing to commit.

diff --git a/builtin-commit-tree.c b/builtin-commit-tree.c
index ec082bf754a0ce5ae1615c41ba32c4515a927361..856f3cd841818bdad4446b3f7b75d5ab22959788 100644 (file)
--- a/builtin-commit-tree.c
+++ b/builtin-commit-tree.c
@@ -69,7 +69,7 @@ static int new_parent(int idx)
        int i;
        unsigned char *sha1 = parent_sha1[idx];
        for (i = 0; i < idx; i++) {
-               if (!memcmp(parent_sha1[i], sha1, 20)) {
+               if (!hashcmp(parent_sha1[i], sha1)) {
                        error("duplicate parent %s ignored", sha1_to_hex(sha1));
                        return 0;
                }
@@ -77,7 +77,7 @@ static int new_parent(int idx)
        return 1;
 }
 
-int cmd_commit_tree(int argc, const char **argv, char **envp)
+int cmd_commit_tree(int argc, const char **argv, const char *prefix)
 {
        int i;
        int parents = 0;
@@ -88,8 +88,6 @@ int cmd_commit_tree(int argc, const char **argv, char **envp)
        unsigned int size;
 
        setup_ident();
-       setup_git_directory();
-
        git_config(git_default_config);
 
        if (argc < 2)
@@ -109,8 +107,6 @@ int cmd_commit_tree(int argc, const char **argv, char **envp)
                if (new_parent(parents))
                        parents++;
        }
-       if (!parents)
-               fprintf(stderr, "Committing initial tree %s\n", argv[1]);
 
        init_buffer(&buffer, &size);
        add_buffer(&buffer, &size, "tree %s\n", sha1_to_hex(tree_sha1));