mirror of
https://github.com/git/git.git
synced 2024-12-18 06:14:59 +08:00
Merge branch 'ni/die-message-fix-for-git-add'
Message updates. * ni/die-message-fix-for-git-add: builtin/add.c: clean up die() messages
This commit is contained in:
commit
6597631888
@ -182,7 +182,7 @@ static int edit_patch(int argc, const char **argv, const char *prefix)
|
||||
git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
|
||||
|
||||
if (repo_read_index(the_repository) < 0)
|
||||
die(_("Could not read the index"));
|
||||
die(_("could not read the index"));
|
||||
|
||||
repo_init_revisions(the_repository, &rev, prefix);
|
||||
rev.diffopt.context = 7;
|
||||
@ -200,15 +200,15 @@ static int edit_patch(int argc, const char **argv, const char *prefix)
|
||||
die(_("editing patch failed"));
|
||||
|
||||
if (stat(file, &st))
|
||||
die_errno(_("Could not stat '%s'"), file);
|
||||
die_errno(_("could not stat '%s'"), file);
|
||||
if (!st.st_size)
|
||||
die(_("Empty patch. Aborted."));
|
||||
die(_("empty patch. aborted"));
|
||||
|
||||
child.git_cmd = 1;
|
||||
strvec_pushl(&child.args, "apply", "--recount", "--cached", file,
|
||||
NULL);
|
||||
if (run_command(&child))
|
||||
die(_("Could not apply '%s'"), file);
|
||||
die(_("could not apply '%s'"), file);
|
||||
|
||||
unlink(file);
|
||||
free(file);
|
||||
@ -568,7 +568,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
|
||||
finish:
|
||||
if (write_locked_index(&the_index, &lock_file,
|
||||
COMMIT_LOCK | SKIP_IF_UNCHANGED))
|
||||
die(_("Unable to write new index file"));
|
||||
die(_("unable to write new index file"));
|
||||
|
||||
dir_clear(&dir);
|
||||
clear_pathspec(&pathspec);
|
||||
|
Loading…
Reference in New Issue
Block a user