diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-02-06 14:31:21 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-02-06 14:31:21 -0800 |
| commit | 184c3b4c735f1c1f0f811fddcf3c2676e7ad613f (patch) | |
| tree | cb31e7c1b5065683639f51189c135a180281562b /builtin | |
| parent | Merge branch 'jk/diff-external-with-no-index' (diff) | |
| parent | reftable/pq_test: comment style fix (diff) | |
| download | git-184c3b4c735f1c1f0f811fddcf3c2676e7ad613f.tar.gz git-184c3b4c735f1c1f0f811fddcf3c2676e7ad613f.zip | |
Merge branch 'jc/comment-style-fixes'
Rewrite //-comments to /* comments */ in files whose comments
prevalently use the latter.
* jc/comment-style-fixes:
reftable/pq_test: comment style fix
merge-ort.c: comment style fix
builtin/worktree: comment style fixes
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/worktree.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/builtin/worktree.c b/builtin/worktree.c index 6d7da11746..9c76b62b02 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c @@ -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; |