Comment style fixes
cover Comment style fixes
Among comments in the traditional /* single liner */ ones, our reviews seem to have missed a few // comments. While they are not illegal per-se, they look out of place mixed with the /* ... */ style comments, which is the prevailing style used in this project.
Fix those small number of style violations in our own code; files with borrowed code that have // comments as the prevalent style are left untouched.
Junio C Hamano (3):
builtin/worktree: comment style fixes
merge-ort.c: comment style fix
reftable/pq_test: comment style fix
builtin/worktree.c | 10 +++++----- merge-ort.c | 2 +- reftable/pq_test.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-)
Signature · 1 line
2.43.0-440-gb50a608ba2
PATCH 1/3 builtin/worktree: comment style fixes
--- builtin/worktree.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
builtin/worktree.c +5 -5
@@ -848,21 +848,21 @@ static int add(int ac, const char **av, const char *prefix)const char *s =worktree_basename (path, &n); new_branch =xstrndup (s, n); }else if (opts.orphan) { -// No-op + ;/* no-op */ }else if (opts.detach) { -// Check HEAD +/* Check HEAD */ if (!strcmp (branch,"HEAD" ))can_use_local_refs (&opts); }else if (ac <2 && new_branch) { -// DWIM: Infer --orphan when repo has no refs. +/* DWIM: Infer --orphan when repo has no refs. */ opts.orphan =dwim_orphan (&opts, !!opt_track,0 ); }else if (ac <2 ) { -// DWIM: Guess branch name from path. +/* DWIM: Guess branch name from path. */ const char *s =dwim_branch (path, &new_branch);if (s) branch = s; -// DWIM: Infer --orphan when repo has no refs. +/* DWIM: Infer --orphan when repo has no refs. */ opts.orphan = (!s) &&dwim_orphan (&opts, !!opt_track,1 ); }else if (ac ==2 ) {struct object_id oid;
Signature · 1 line
2.43.0-440-gb50a608ba2
PATCH 2/3 merge-ort.c: comment style fix
In reply to Junio C Hamano--- merge-ort.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
merge-ort.c +1 -1
@@ -2641,7 +2641,7 @@ static void apply_directory_rename_modifications(struct merge_options *opt,oidcpy (&ci->stages[i].oid,null_oid ()); } -// Now we want to focus on new_ci, so reassign ci to it +/* Now we want to focus on new_ci, so reassign ci to it. */ ci = new_ci; }
Signature · 1 line
2.43.0-440-gb50a608ba2
PATCH 3/3 reftable/pq_test: comment style fix
In reply to Junio C Hamano--- reftable/pq_test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
reftable/pq_test.c +1 -1
@@ -60,7 +60,7 @@ static void test_pq(void)if (last) {EXPECT (strcmp (last, rec->u.ref.refname) <0 ); } -// this is names[i], so don't dealloc. +/* this is names[i], so don't dealloc. */ last = rec->u.ref.refname; rec->u.ref.refname =NULL ;reftable_record_release (rec);
Signature · 1 line
2.43.0-440-gb50a608ba2
Quoted 8 lines · Junio C Hamano
Among comments in the traditional /* single liner */ ones, our reviews seem to have missed a few // comments. While they are not illegal per-se, they look out of place mixed with the /* ... */ style comments, which is the prevailing style used in this project.
Fix those small number of style violations in our own code; files with borrowed code that have // comments as the prevalent style are left untouched.
These changes look obviously good to me, thanks!
Patrick