send-pack: rename ref_update_to_be_sent to check_to_send_update
This renames ref_update_to_be_sent to check_to_send_update and inverts the meaning of the return value. Having the return value inverted we can have different values for the error codes. This is useful in a later patch when we want to know if we hit the CHECK_REF_STATUS_REJECTED case. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Stefan Beller committed
Jan 7, 2015 at 19:23 UTC
7582e9397c5b49de10a138a4f477a38b4ed1b3ab
1 file changed
+11
-7
send-pack.c
+11
-7
@@ -190,10 +190,13 @@ static void advertise_shallow_grafts_buf(struct strbuf *sb)
190
for_each_commit_graft(advertise_shallow_grafts_cb, sb);
191
}
192
193
-static int ref_update_to_be_sent(const struct ref *ref, const struct send_pack_args *args)
193
+#define CHECK_REF_NO_PUSH -1
194
+#define CHECK_REF_STATUS_REJECTED -2
195
+#define CHECK_REF_UPTODATE -3
196
+static int check_to_send_update(const struct ref *ref, const struct send_pack_args *args)
197
{
198
if (!ref->peer_ref && !args->send_mirror)
196
- return 0;
199
+ return CHECK_REF_NO_PUSH;
200
201
/* Check for statuses set by set_ref_status_for_push() */
202
switch (ref->status) {
@@ -203,10 +206,11 @@ static int ref_update_to_be_sent(const struct ref *ref, const struct send_pack_a
206
case REF_STATUS_REJECT_NEEDS_FORCE:
207
case REF_STATUS_REJECT_STALE:
208
case REF_STATUS_REJECT_NODELETE:
209
+ return CHECK_REF_STATUS_REJECTED;
210
case REF_STATUS_UPTODATE:
207
- return 0;
211
+ return CHECK_REF_UPTODATE;
212
default:
209
- return 1;
213
+ return 0;
214
}
215
}
216
@@ -250,7 +254,7 @@ static int generate_push_cert(struct strbuf *req_buf,
254
strbuf_addstr(&cert, "\n");
255
256
for (ref = remote_refs; ref; ref = ref->next) {
253
- if (!ref_update_to_be_sent(ref, args))
257
+ if (check_to_send_update(ref, args) < 0)
258
continue;
259
update_seen = 1;
260
strbuf_addf(&cert, "%s %s %s\n",
@@ -359,7 +363,7 @@ int send_pack(struct send_pack_args *args,
363
* the pack data.
364
*/
365
for (ref = remote_refs; ref; ref = ref->next) {
362
- if (!ref_update_to_be_sent(ref, args))
366
+ if (check_to_send_update(ref, args) < 0)
367
continue;
368
369
if (!ref->deletion)
@@ -380,7 +384,7 @@ int send_pack(struct send_pack_args *args,
384
if (args->dry_run || args->push_cert)
385
continue;
386
383
- if (!ref_update_to_be_sent(ref, args))
387
+ if (check_to_send_update(ref, args) < 0)
388
continue;
389
390
old_hex = sha1_to_hex(ref->old_sha1);