summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--builtin/add.c2
-rw-r--r--builtin/apply.c2
-rw-r--r--builtin/checkout-index.c2
-rw-r--r--builtin/checkout.c4
-rw-r--r--builtin/clone.c2
-rw-r--r--builtin/commit.c15
-rw-r--r--builtin/merge.c2
-rw-r--r--builtin/mv.c2
-rw-r--r--builtin/read-tree.c2
-rw-r--r--builtin/rm.c2
-rw-r--r--builtin/update-index.c2
-rw-r--r--merge-recursive.c2
-rw-r--r--merge.c2
-rw-r--r--rerere.c2
-rw-r--r--sequencer.c5
15 files changed, 26 insertions, 22 deletions
diff --git a/builtin/add.c b/builtin/add.c
index 3390933d68..793c77fd5b 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -443,7 +443,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
finish:
if (active_cache_changed) {
if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
- die(_("Unable to write new index file"));
+ die(_("unable to write index file"));
}
return exit_status;
diff --git a/builtin/apply.c b/builtin/apply.c
index 0769b09287..582eb375dc 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -4672,7 +4672,7 @@ int cmd_apply(int argc, const char **argv, const char *prefix_)
if (update_index) {
if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
- die(_("Unable to write new index file"));
+ die(_("unable to write index file"));
}
return !!errs;
diff --git a/builtin/checkout-index.c b/builtin/checkout-index.c
index 9ca2da1583..51cb5b5198 100644
--- a/builtin/checkout-index.c
+++ b/builtin/checkout-index.c
@@ -281,6 +281,6 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix)
if (0 <= newfd &&
write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
- die("Unable to write new index file");
+ die("unable to write index file");
return 0;
}
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 3e141fc149..68b5f9c56c 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -371,7 +371,7 @@ static int checkout_paths(const struct checkout_opts *opts,
}
if (write_locked_index(&the_index, lock_file, COMMIT_LOCK))
- die(_("unable to write new index file"));
+ die(_("unable to write index file"));
read_ref_full("HEAD", 0, rev, &flag);
head = lookup_commit_reference_gently(rev, 1);
@@ -577,7 +577,7 @@ static int merge_working_tree(const struct checkout_opts *opts,
cache_tree_update(&the_index, WRITE_TREE_SILENT | WRITE_TREE_REPAIR);
if (write_locked_index(&the_index, lock_file, COMMIT_LOCK))
- die(_("unable to write new index file"));
+ die(_("unable to write index file"));
if (!opts->force && !opts->quiet)
show_local_changes(&new->commit->object, &opts->diff_options);
diff --git a/builtin/clone.c b/builtin/clone.c
index 53a2e5af35..4f2e56e0f7 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -659,7 +659,7 @@ static int checkout(void)
die(_("unable to checkout working tree"));
if (write_locked_index(&the_index, lock_file, COMMIT_LOCK))
- die(_("unable to write new index file"));
+ die(_("unable to write index file"));
err |= run_hook_le(NULL, "post-checkout", sha1_to_hex(null_sha1),
sha1_to_hex(sha1), "1", NULL);
diff --git a/builtin/commit.c b/builtin/commit.c
index 2bc5092a57..6e7c6fd1b8 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -341,7 +341,8 @@ static const char *prepare_index(int argc, const char **argv, const char *prefix
refresh_cache_or_die(refresh_flags);
if (write_locked_index(&the_index, &index_lock, CLOSE_LOCK))
- die(_("unable to create temporary index"));
+ /* TRANSLATORS: match with "unable to write index file" */
+ die(_("unable to write temporary index file"));
old_index_env = getenv(INDEX_ENVIRONMENT);
setenv(INDEX_ENVIRONMENT, index_lock.filename.buf, 1);
@@ -360,7 +361,7 @@ static const char *prepare_index(int argc, const char **argv, const char *prefix
if (reopen_lock_file(&index_lock) < 0)
die(_("unable to write index file"));
if (write_locked_index(&the_index, &index_lock, CLOSE_LOCK))
- die(_("unable to update temporary index"));
+ die(_("unable to write temporary index file"));
} else
warning(_("Failed to update main cache tree"));
@@ -386,7 +387,7 @@ static const char *prepare_index(int argc, const char **argv, const char *prefix
refresh_cache_or_die(refresh_flags);
update_main_cache_tree(WRITE_TREE_SILENT);
if (write_locked_index(&the_index, &index_lock, CLOSE_LOCK))
- die(_("unable to write new_index file"));
+ die(_("unable to write index file"));
commit_style = COMMIT_NORMAL;
return index_lock.filename.buf;
}
@@ -411,7 +412,7 @@ static const char *prepare_index(int argc, const char **argv, const char *prefix
if (active_cache_changed) {
if (write_locked_index(&the_index, &index_lock,
COMMIT_LOCK))
- die(_("unable to write new_index file"));
+ die(_("unable to write index file"));
} else {
rollback_lock_file(&index_lock);
}
@@ -460,7 +461,7 @@ static const char *prepare_index(int argc, const char **argv, const char *prefix
refresh_cache(REFRESH_QUIET);
update_main_cache_tree(WRITE_TREE_SILENT);
if (write_locked_index(&the_index, &index_lock, CLOSE_LOCK))
- die(_("unable to write new_index file"));
+ die(_("unable to write index file"));
hold_lock_file_for_update(&false_lock,
git_path("next-index-%"PRIuMAX,
@@ -472,6 +473,7 @@ static const char *prepare_index(int argc, const char **argv, const char *prefix
refresh_cache(REFRESH_QUIET);
if (write_locked_index(&the_index, &false_lock, CLOSE_LOCK))
+ /* TRANSLATORS: match with "unable to write index file" */
die(_("unable to write temporary index file"));
discard_cache();
@@ -1784,8 +1786,9 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
unlink(git_path("SQUASH_MSG"));
if (commit_index_files())
+ /* TRANSLATORS: match with "unable to write index file" */
die (_("Repository has been updated, but unable to write\n"
- "new_index file. Check that disk is not full and quota is\n"
+ "index file. Check that disk is not full and quota is\n"
"not exceeded, and then \"git reset HEAD\" to recover."));
rerere(0);
diff --git a/builtin/merge.c b/builtin/merge.c
index 3b0f8f96d4..1e5e34b837 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -664,7 +664,7 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common,
refresh_cache(REFRESH_QUIET);
if (active_cache_changed &&
write_locked_index(&the_index, &lock, COMMIT_LOCK))
- return error(_("Unable to write index."));
+ return error(_("unable to write index file"));
rollback_lock_file(&lock);
if (!strcmp(strategy, "recursive") || !strcmp(strategy, "subtree")) {
diff --git a/builtin/mv.c b/builtin/mv.c
index d1d43168ae..41e2018145 100644
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -276,7 +276,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
if (active_cache_changed &&
write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
- die(_("Unable to write new index file"));
+ die(_("unable to write index file"));
return 0;
}
diff --git a/builtin/read-tree.c b/builtin/read-tree.c
index 43b47f72f1..b21d8f7508 100644
--- a/builtin/read-tree.c
+++ b/builtin/read-tree.c
@@ -244,6 +244,6 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
prime_cache_tree(&the_index, trees[0]);
if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
- die("unable to write new index file");
+ die("unable to write index file");
return 0;
}
diff --git a/builtin/rm.c b/builtin/rm.c
index 3304bff42a..988965e7bd 100644
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -428,7 +428,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
if (active_cache_changed) {
if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
- die(_("Unable to write new index file"));
+ die(_("unable to write index file"));
}
return 0;
diff --git a/builtin/update-index.c b/builtin/update-index.c
index 6271b54adc..78d0d43a93 100644
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -947,7 +947,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
unable_to_lock_die(get_index_file(), lock_error);
}
if (write_locked_index(&the_index, lock_file, COMMIT_LOCK))
- die("Unable to write new index file");
+ die("unable to write index file");
}
rollback_lock_file(lock_file);
diff --git a/merge-recursive.c b/merge-recursive.c
index 1c9c30db6c..d86be9b521 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -2016,7 +2016,7 @@ int merge_recursive_generic(struct merge_options *o,
result);
if (active_cache_changed &&
write_locked_index(&the_index, lock, COMMIT_LOCK))
- return error(_("Unable to write index."));
+ return error(_("unable to write index file"));
return clean ? 0 : 1;
}
diff --git a/merge.c b/merge.c
index fcff632bd6..0f7bde4e6d 100644
--- a/merge.c
+++ b/merge.c
@@ -91,6 +91,6 @@ int checkout_fast_forward(const unsigned char *head,
if (unpack_trees(nr_trees, t, &opts))
return -1;
if (write_locked_index(&the_index, lock_file, COMMIT_LOCK))
- die(_("unable to write new index file"));
+ die(_("unable to write index file"));
return 0;
}
diff --git a/rerere.c b/rerere.c
index 31644dec04..d760e020d4 100644
--- a/rerere.c
+++ b/rerere.c
@@ -491,7 +491,7 @@ static void update_paths(struct string_list *update)
if (active_cache_changed) {
if (write_locked_index(&the_index, &index_lock, COMMIT_LOCK))
- die("Unable to write new index file");
+ die("unable to write index file");
} else
rollback_lock_file(&index_lock);
}
diff --git a/sequencer.c b/sequencer.c
index c4f4b7d571..f8421a8d61 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -317,8 +317,9 @@ static int do_recursive_merge(struct commit *base, struct commit *next,
if (active_cache_changed &&
write_locked_index(&the_index, &index_lock, COMMIT_LOCK))
- /* TRANSLATORS: %s will be "revert" or "cherry-pick" */
- die(_("%s: Unable to write new index file"), action_name(opts));
+ /* TRANSLATORS: %s will be "revert" or "cherry-pick"
+ match this with "unable to write index file" */
+ die(_("%s: unable to write index file"), action_name(opts));
rollback_lock_file(&index_lock);
if (opts->signoff)
View Lorry Controller Status