summaryrefslogtreecommitdiff
path: root/t/t7405-submodule-merge.sh
diff options
context:
space:
mode:
authorLibravatar Johan Herland <johan@herland.net>2010-11-15 00:52:26 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-11-17 13:21:02 -0800
commit180619a58572b17de0ebeb96989e0aa832765186 (patch)
tree536ac12ce331a940e9c7091fcc19856670756ac7 /t/t7405-submodule-merge.sh
parentnotes.h/c: Allow combine_notes functions to remove notes (diff)
downloadtgif-180619a58572b17de0ebeb96989e0aa832765186.tar.xz
notes.h/c: Propagate combine_notes_fn return value to add_note() and beyond
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 <jrnieder@gmail.com> Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7405-submodule-merge.sh')
0 files changed, 0 insertions, 0 deletions