rebase -i: Simplify commit counting for generated commit messages

diff --git a/builtin-tar-tree.c b/builtin-tar-tree.c
index f88e7219367c309dbc3d3e7ce2db32666703a91d..3f1e7012db1af7d3695e6517956721a313229d65 100644 (file)
--- a/builtin-tar-tree.c
+++ b/builtin-tar-tree.c
@@ -11,6 +11,9 @@ static const char tar_tree_usage[] =
 "git tar-tree [--remote=<repo>] <tree-ish> [basedir]\n"
 "*** Note that this command is now deprecated; use \"git archive\" instead.";
 
+static const char builtin_get_tar_commit_id_usage[] =
+"git get-tar-commit-id < <tarfile>";
+
 int cmd_tar_tree(int argc, const char **argv, const char *prefix)
 {
        /*
@@ -81,6 +84,9 @@ int cmd_get_tar_commit_id(int argc, const char **argv, const char *prefix)
        char *content = buffer + RECORDSIZE;
        ssize_t n;
 
+       if (argc != 1)
+               usage(builtin_get_tar_commit_id_usage);
+
        n = read_in_full(0, buffer, HEADERSIZE);
        if (n < HEADERSIZE)
                die("git get-tar-commit-id: read error");
@@ -91,7 +97,7 @@ int cmd_get_tar_commit_id(int argc, const char **argv, const char *prefix)
 
        n = write_in_full(1, content + 11, 41);
        if (n < 41)
-               die("git get-tar-commit-id: write error");
+               die_errno("git get-tar-commit-id: write error");
 
        return 0;
 }