Junio C Hamano <gitster@xxxxxxxxx> writes:
> In this particular patch, there was only one such instance that the
> tools output was noticeably more irritating than the original. With
> more excercise like this with enough positive experience (I do count
> this one as positive, if we fix the space after "foreach"), I might
> change my mind.
And for completeness, if you choose to take the tool-generated style
changes, here is what I want you to also place on top.
And then, I want those who advocate blind application of tool's
output, only because then we would have somebody else to blame for
poorly formatted code, to think if they can improve the rule to
consider these points as well.
Thanks.
--- >8 ---
Subject: [PATCH] (style) fix bad changes suggested by clang-format
* The commands array in git.c is traditionally one line per
command, a possibly long line is not wrapped for grep-ability.
* No SP between "foreach" and "(".
* When wrapping a line, keep related things together.
---
git.c | 12 ++++--------
last-modified.c | 8 ++++----
2 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/git.c b/git.c
index 918d83762a..8ad1ce8dea 100644
--- a/git.c
+++ b/git.c
@@ -576,14 +576,10 @@ static struct cmd_struct commands[] = {
{ "merge-file", cmd_merge_file, RUN_SETUP_GENTLY },
{ "merge-index", cmd_merge_index, RUN_SETUP | NO_PARSEOPT },
{ "merge-ours", cmd_merge_ours, RUN_SETUP | NO_PARSEOPT },
- { "merge-recursive", cmd_merge_recursive,
- RUN_SETUP | NEED_WORK_TREE | NO_PARSEOPT },
- { "merge-recursive-ours", cmd_merge_recursive,
- RUN_SETUP | NEED_WORK_TREE | NO_PARSEOPT },
- { "merge-recursive-theirs", cmd_merge_recursive,
- RUN_SETUP | NEED_WORK_TREE | NO_PARSEOPT },
- { "merge-subtree", cmd_merge_recursive,
- RUN_SETUP | NEED_WORK_TREE | NO_PARSEOPT },
+ { "merge-recursive", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE | NO_PARSEOPT },
+ { "merge-recursive-ours", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE | NO_PARSEOPT },
+ { "merge-recursive-theirs", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE | NO_PARSEOPT },
+ { "merge-subtree", cmd_merge_recursive, RUN_SETUP | NEED_WORK_TREE | NO_PARSEOPT },
{ "merge-tree", cmd_merge_tree, RUN_SETUP },
{ "mktag", cmd_mktag, RUN_SETUP },
{ "mktree", cmd_mktree, RUN_SETUP },
diff --git a/last-modified.c b/last-modified.c
index f7f6a67d3b..dfa3b2d324 100644
--- a/last-modified.c
+++ b/last-modified.c
@@ -116,7 +116,7 @@ void last_modified_release(struct last_modified *lm)
struct hashmap_iter iter;
struct last_modified_entry *ent;
- hashmap_for_each_entry (&lm->paths, &iter, ent, hashent)
+ hashmap_for_each_entry(&lm->paths, &iter, ent, hashent)
clear_bloom_key(&ent->key);
hashmap_clear_and_free(&lm->paths, struct last_modified_entry, hashent);
@@ -210,7 +210,7 @@ static int maybe_changed_path(struct last_modified *lm, struct commit *origin)
if (!filter)
return 1;
- hashmap_for_each_entry (&lm->paths, &iter, ent, hashent) {
+ hashmap_for_each_entry(&lm->paths, &iter, ent, hashent) {
if (bloom_filter_contains(filter, &ent->key,
lm->rev.bloom_filter_settings))
return 1;
@@ -218,8 +218,8 @@ static int maybe_changed_path(struct last_modified *lm, struct commit *origin)
return 0;
}
-int last_modified_run(struct last_modified *lm, last_modified_callback cb,
- void *cbdata)
+int last_modified_run(struct last_modified *lm,
+ last_modified_callback cb, void *cbdata)
{
struct last_modified_callback_data data;
--
2.50.0-278-g6118fc98aa
