Commit d5c84f67d311ed177ddfbd1c2645e23e46df5729
2014-11-23T21:34:45
local: adjust to the common refspec parser We no longer have NULL strings, but empty ones and duplicate the sides if necessar, so the first check will never do anything. While in the area, remove unnecessary ifs and early returns.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39
diff --git a/src/transports/local.c b/src/transports/local.c
index c544fa9..3846f06 100644
--- a/src/transports/local.c
+++ b/src/transports/local.c
@@ -339,14 +339,11 @@ static int local_push_update_remote_ref(
int error;
git_reference *remote_ref = NULL;
- /* rref will be NULL if it is implicit in the pushspec (e.g. 'b1:') */
- rref = rref ? rref : lref;
-
- if (lref) {
+ /* check for lhs, if it's empty it means to delete */
+ if (lref[0] != '\0') {
/* Create or update a ref */
- if ((error = git_reference_create(NULL, remote_repo, rref, loid,
- !git_oid_iszero(roid), NULL, NULL)) < 0)
- return error;
+ error = git_reference_create(NULL, remote_repo, rref, loid,
+ !git_oid_iszero(roid), NULL, NULL);
} else {
/* Delete a ref */
if ((error = git_reference_lookup(&remote_ref, remote_repo, rref)) < 0) {
@@ -355,13 +352,11 @@ static int local_push_update_remote_ref(
return error;
}
- if ((error = git_reference_delete(remote_ref)) < 0)
- return error;
-
+ error = git_reference_delete(remote_ref);
git_reference_free(remote_ref);
}
- return 0;
+ return error;
}
static int local_push(