diff mbox series

[v2] notes: update documentation for `use_default_notes`

Message ID 3c757bcb3d5c8b597b7f267549f90e1a021d229a.1685535115.git.code@khaugsbakk.name (mailing list archive)
State Superseded
Headers show
Series [v2] notes: update documentation for `use_default_notes` | expand

Commit Message

Kristoffer Haugsbakk May 31, 2023, 12:14 p.m. UTC
`suppress_default_notes` was renamed to `use_default_notes` in
3a03cf6b1d (notes: refactor display notes default handling,
2011-03-29).

The commit message says that “values less than one [indicates] “not
set” ”, but I think what was meant was “less than zero”.

Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
---

Notes (series):
    § v2
    
    • Fix sloppy typos (sorry about that)
    • “default notes” instead of “default refs”
    • Don’t drop “it” (“treat it like”)

 notes.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Jeff King June 1, 2023, 5:52 p.m. UTC | #1
On Wed, May 31, 2023 at 02:14:21PM +0200, Kristoffer Haugsbakk wrote:

> `suppress_default_notes` was renamed to `use_default_notes` in
> 3a03cf6b1d (notes: refactor display notes default handling,
> 2011-03-29).
> 
> The commit message says that “values less than one [indicates] “not
> set” ”, but I think what was meant was “less than zero”.

Yes, I think you're right. Thanks for catching my error, however
belatedly. ;)

> diff --git a/notes.h b/notes.h
> index c1682c39a9..826a2595fa 100644
> --- a/notes.h
> +++ b/notes.h
> @@ -286,8 +286,9 @@ void disable_display_notes(struct display_notes_opt *opt, int *show_notes);
>   * If 'opt' is not NULL, then it specifies additional settings for the
>   * displaying:
>   *
> - * - suppress_default_notes indicates that the notes from
> - *   core.notesRef and notes.displayRef should not be loaded.
> + * - use_default_notes: less than `0` is "unset", which means that the
> + *   default notes are shown iff no other notes are given. Else treat it
> + *   like a boolean.
>   *
>   * - extra_notes_refs may contain a list of globs (in the same style
>   *   as notes.displayRef) where notes should be loaded from.

This looks good to me. Arguably these should be documented in the
definition of "struct display_notes_opt", which would have avoided the
problem (3a03cf6b1d would not have forgotten to update the name since it
would be right there already). But it may not be worth the trouble to
move them now.

-Peff
Kristoffer Haugsbakk June 2, 2023, 10:09 a.m. UTC | #2
Hi Peff

On Thu, Jun 1, 2023, at 19:52, Jeff King wrote:
> This looks good to me. Arguably these should be documented in the
> definition of "struct display_notes_opt", which would have avoided the
> problem (3a03cf6b1d would not have forgotten to update the name since it
> would be right there already). But it may not be worth the trouble to
> move them now.

Sounds like a good change to me. I’ll make a new version tomorrow unless
someone disagrees about that before that time.
diff mbox series

Patch

diff --git a/notes.h b/notes.h
index c1682c39a9..826a2595fa 100644
--- a/notes.h
+++ b/notes.h
@@ -286,8 +286,9 @@  void disable_display_notes(struct display_notes_opt *opt, int *show_notes);
  * If 'opt' is not NULL, then it specifies additional settings for the
  * displaying:
  *
- * - suppress_default_notes indicates that the notes from
- *   core.notesRef and notes.displayRef should not be loaded.
+ * - use_default_notes: less than `0` is "unset", which means that the
+ *   default notes are shown iff no other notes are given. Else treat it
+ *   like a boolean.
  *
  * - extra_notes_refs may contain a list of globs (in the same style
  *   as notes.displayRef) where notes should be loaded from.