Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions builtin/cat-file.c
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name)

if (get_oid_with_context(the_repository, obj_name, get_oid_flags, &oid,
&obj_context))
die("Not a valid object name %s", obj_name);
die("not a valid object name %s", obj_name);

if (!path)
path = obj_context.path;
Expand Down Expand Up @@ -182,7 +182,7 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name)
case 'p':
type = odb_read_object_info(the_repository->objects, &oid, NULL);
if (type < 0)
die("Not a valid object name %s", obj_name);
die("not a valid object name %s", obj_name);

/* custom pretty-print here */
if (type == OBJ_TREE) {
Expand All @@ -200,7 +200,7 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name)
buf = odb_read_object(the_repository->objects, &oid,
&type, &size);
if (!buf)
die("Cannot read object %s", obj_name);
die("cannot read object %s", obj_name);

if (use_mailmap) {
size_t s = size;
Expand Down Expand Up @@ -910,7 +910,7 @@ static int batch_objects(struct batch_options *opt)
data.skip_object_info = 1;

if (repo_has_promisor_remote(the_repository))
warning("This repository uses promisor remotes. Some objects may not be loaded.");
warning("this repository uses promisor remotes; some objects may not be loaded");

disable_replace_refs();

Expand Down
2 changes: 1 addition & 1 deletion builtin/describe.c
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,7 @@ static void describe(const char *arg, int last_one)
fprintf(stderr, _("describe %s\n"), arg);

if (repo_get_oid(the_repository, arg, &oid))
die(_("Not a valid object name %s"), arg);
die(_("not a valid object name %s"), arg);
cmit = lookup_commit_reference_gently(the_repository, &oid, 1);

if (cmit)
Expand Down
2 changes: 1 addition & 1 deletion builtin/ls-tree.c
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ int cmd_ls_tree(int argc,
usage_with_options(ls_tree_usage, ls_tree_options);
if (repo_get_oid_with_flags(the_repository, argv[0], &oid,
GET_OID_HASH_ANY))
die("Not a valid object name %s", argv[0]);
die("not a valid object name %s", argv[0]);

/*
* show_recursive() rolls its own matching code and is
Expand Down
4 changes: 2 additions & 2 deletions builtin/merge-base.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ static struct commit *get_commit_reference(const char *arg)
struct commit *r;

if (repo_get_oid(the_repository, arg, &revkey))
die("Not a valid object name %s", arg);
die("not a valid object name %s", arg);
r = lookup_commit_reference(the_repository, &revkey);
if (!r)
die("Not a valid commit name %s", arg);
Expand Down Expand Up @@ -131,7 +131,7 @@ static int handle_fork_point(int argc, const char **argv)

commitname = (argc == 2) ? argv[1] : "HEAD";
if (repo_get_oid(the_repository, commitname, &oid))
die("Not a valid object name: '%s'", commitname);
die("not a valid object name: '%s'", commitname);

derived = lookup_commit_reference(the_repository, &oid);

Expand Down
2 changes: 1 addition & 1 deletion builtin/read-tree.c
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ int cmd_read_tree(int argc,
const char *arg = argv[i];

if (repo_get_oid(the_repository, arg, &oid))
die("Not a valid object name %s", arg);
die("not a valid object name %s", arg);
if (list_tree(&oid) < 0)
die("failed to unpack tree object %s", arg);
stage++;
Expand Down
2 changes: 1 addition & 1 deletion builtin/unpack-file.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ int cmd_unpack_file(int argc,
if (argc != 2)
usage(usage_msg);
if (repo_get_oid(the_repository, argv[1], &oid))
die("Not a valid object name %s", argv[1]);
die("not a valid object name %s", argv[1]);

repo_config(the_repository, git_default_config, NULL);

Expand Down
6 changes: 3 additions & 3 deletions t/t1006-cat-file.sh
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,7 @@ do
then
cat >expect <<-EOF
error: header for $bogus_long_oid too long, exceeds 32 bytes
fatal: Not a valid object name $bogus_long_oid
fatal: not a valid object name $bogus_long_oid
EOF
else
cat >expect <<-EOF
Expand All @@ -721,7 +721,7 @@ do

test_expect_success "cat-file $arg1 error on missing short OID" '
cat >expect.err <<-EOF &&
fatal: Not a valid object name $(test_oid deadbeef_short)
fatal: not a valid object name $(test_oid deadbeef_short)
EOF
test_must_fail git cat-file $arg1 $(test_oid deadbeef_short) >out 2>err.actual &&
test_must_be_empty out &&
Expand All @@ -732,7 +732,7 @@ do
if test "$arg1" = "-p"
then
cat >expect.err <<-EOF
fatal: Not a valid object name $(test_oid deadbeef)
fatal: not a valid object name $(test_oid deadbeef)
EOF
else
cat >expect.err <<-\EOF
Expand Down
2 changes: 1 addition & 1 deletion t/t8007-cat-file-textconv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ test_expect_success 'setup ' '

test_expect_success 'usage: <bad rev>' '
cat >expect <<-\EOF &&
fatal: Not a valid object name HEAD2
fatal: not a valid object name HEAD2
EOF
test_must_fail git cat-file --textconv HEAD2 2>actual &&
test_cmp expect actual
Expand Down
Loading