diff options
author | Ronnie Sahlberg <sahlberg@google.com> | 2014-06-20 07:43:00 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-07-14 11:54:42 -0700 |
commit | 8e34800e5bce1dc6f1ab5520a4c866a2a73639de (patch) | |
tree | e868c5deecd615291d84ae6c3900dbf70b133876 /contrib/examples/git-merge.sh | |
parent | refs.c: remove the onerr argument to ref_transaction_commit (diff) | |
download | tgif-8e34800e5bce1dc6f1ab5520a4c866a2a73639de.tar.xz |
refs.c: change ref_transaction_update() to do error checking and return status
Update ref_transaction_update() do some basic error checking and return
non-zero on error. Update all callers to check ref_transaction_update() for
error. There are currently no conditions in _update that will return error but
there will be in the future. Add an err argument that will be updated on
failure. In future patches we will start doing both locking and checking
for name conflicts in _update instead of _commit at which time this function
will start returning errors for these conditions.
Also check for BUGs during update and die(BUG:...) if we are calling
_update with have_old but the old_sha1 pointer is NULL.
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Acked-by: Michael Haggerty <mhagger@alum.mit.edu>
Diffstat (limited to 'contrib/examples/git-merge.sh')
0 files changed, 0 insertions, 0 deletions