unpack-trees: rename "gently" flag to "quiet"
The gently flag was added in 17e4642667 (Add flag to make unpack_trees() not print errors. - 2008-02-07) to suppress error messages. The name "gently" does not quite express that. Granted, being quiet is gentle but it could mean not performing some other actions. Rename the flag to "quiet" to be more on point. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy committed
Mar 22, 2019 at 16:31 UTC
b165fac8c1970e9cc9e5a0715a2f06b3530b2570
3 files changed
+5
-5
builtin/checkout.c
+1
-1
@@ -700,7 +700,7 @@ static int merge_working_tree(const struct checkout_opts *opts,
700
topts.initial_checkout = is_cache_unborn();
701
topts.update = 1;
702
topts.merge = 1;
703
- topts.gently = opts->merge && old_branch_info->commit;
703
+ topts.quiet = opts->merge && old_branch_info->commit;
704
topts.verbose_update = opts->show_progress;
705
topts.fn = twoway_merge;
706
if (opts->overwrite_ignore) {
unpack-trees.c
+3
-3
@@ -219,7 +219,7 @@ static int add_rejected_path(struct unpack_trees_options *o,
219
enum unpack_trees_error_types e,
220
const char *path)
221
{
222
- if (o->gently)
222
+ if (o->quiet)
223
return -1;
224
225
if (!o->show_all_errors)
@@ -1042,7 +1042,7 @@ static int unpack_nondirectories(int n, unsigned long mask,
1042
static int unpack_failed(struct unpack_trees_options *o, const char *message)
1043
{
1044
discard_index(&o->result);
1045
- if (!o->gently && !o->exiting_early) {
1045
+ if (!o->quiet && !o->exiting_early) {
1046
if (message)
1047
return error("%s", message);
1048
return -1;
@@ -2343,7 +2343,7 @@ int bind_merge(const struct cache_entry * const *src,
2343
return error("Cannot do a bind merge of %d trees",
2344
o->merge_size);
2345
if (a && old)
2346
- return o->gently ? -1 :
2346
+ return o->quiet ? -1 :
2347
error(ERRORMSG(o, ERROR_BIND_OVERLAP),
2348
super_prefixed(a->name),
2349
super_prefixed(old->name));
unpack-trees.h
+1
-1
@@ -56,7 +56,7 @@ struct unpack_trees_options {
56
diff_index_cached,
57
debug_unpack,
58
skip_sparse_checkout,
59
- gently,
59
+ quiet,
60
exiting_early,
61
show_all_errors,
62
dry_run;