Skip to content
Commits on Nov 17, 2010
  1. @jherland @gitster

    notes.h/c: Propagate combine_notes_fn return value to add_note() and …

    jherland committed with gitster
    The combine_notes_fn functions uses a non-zero return value to indicate
    failure. However, this return value was converted to a call to die()
    in note_tree_insert().
    Instead, propagate this return value out to add_note(), and return it
    from there to enable the caller to handle errors appropriately.
    Existing add_note() callers are updated to die() upon failure, thus
    preserving the current behaviour. The only exceptions are copy_note()
    and notes_cache_put() where we are able to propagate the add_note()
    return value instead.
    This patch has been improved by the following contributions:
    - Jonathan Nieder: Future-proof by always checking add_note() return value
    - Jonathan Nieder: Improve clarity of final if-condition in note_tree_insert()
    Thanks-to: Jonathan Nieder <>
    Signed-off-by: Johan Herland <>
    Signed-off-by: Junio C Hamano <>
Something went wrong with that request. Please try again.