undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refs.c: add an err argument to delete_ref_loose

Browse Source 
Add an err argument to delete_ref_loose so that we can pass a descriptive
error string back to the caller. Pass the err argument from transaction
commit to this function so that transaction users will have a nice error
string if the transaction failed due to delete_ref_loose.

Signed-off-by: Ronnie Sahlberg <sahlberg@google.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ronnie Sahlberg 2014-05-15 08:25:23 -07:00 committed by Junio C Hamano
parent 9ccc0c0896
commit dbdcac7d5c
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
refs.c
View File

@ -2597,7 +2597,7 @@ int repack_without_refs(const char **refnames, int n, struct strbuf *err)
return ret;
}
static int delete_ref_loose(struct ref_lock *lock, int flag)
static int delete_ref_loose(struct ref_lock *lock, int flag, struct strbuf *err)
{
if (!(flag & REF_ISPACKED) || flag & REF_ISSYMREF) {
/*
@ -2605,9 +2605,9 @@ static int delete_ref_loose(struct ref_lock *lock, int flag)
* lockfile name, minus ".lock":
*/
char *loose_filename = get_locked_file_path(lock->lk);
int err = unlink_or_warn(loose_filename);
int res = unlink_or_msg(loose_filename, err);
free(loose_filename);
if (err)
if (res)
return 1;
}
return 0;
@ -3658,7 +3658,8 @@ int ref_transaction_commit(struct ref_transaction *transaction,
struct ref_update *update = updates[i];
if (update->lock) {
ret |= delete_ref_loose(update->lock, update->type);
ret |= delete_ref_loose(update->lock, update->type,
err);
if (!(update->flags & REF_ISPRUNING))
delnames[delnum++] = update->lock->ref_name;
}