mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reflog_expire(): integrate lock_ref_sha1_basic() errors into ours

Browse Source 
Now that lock_ref_sha1_basic() gives us back its error messages via a
strbuf, incorporate its error message into our error message rather
than emitting two separate error messages.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
This commit is contained in:
Michael Haggerty
2015-05-11 17:25:20 +02:00
committed by Junio C Hamano
parent 3553944aa8
commit c628edfddb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
refs.c
View File

@ -4118,9 +4118,9 @@ int reflog_expire(const char *refname, const unsigned char *sha1,
*/ */
lock = lock_ref_sha1_basic(refname, sha1, NULL, NULL, 0, &type, &err); lock = lock_ref_sha1_basic(refname, sha1, NULL, NULL, 0, &type, &err);
if (!lock) { if (!lock) {
error("%s", err.buf); error("cannot lock ref '%s': %s", refname, err.buf);
strbuf_release(&err); strbuf_release(&err);
return error("cannot lock ref '%s'", refname); return -1;
} }
if (!reflog_exists(refname)) { if (!reflog_exists(refname)) {
unlock_ref(lock); unlock_ref(lock);