Skip to content

Commit 7582e93

Browse files
stefanbellergitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 1b70fe5 commit 7582e93

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

send-pack.c

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -190,10 +190,13 @@ static void advertise_shallow_grafts_buf(struct strbuf *sb)
190190
for_each_commit_graft(advertise_shallow_grafts_cb, sb);
191191
}
192192

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)
194197
{
195198
if (!ref->peer_ref && !args->send_mirror)
196-
return 0;
199+
return CHECK_REF_NO_PUSH;
197200

198201
/* Check for statuses set by set_ref_status_for_push() */
199202
switch (ref->status) {
@@ -203,10 +206,11 @@ static int ref_update_to_be_sent(const struct ref *ref, const struct send_pack_a
203206
case REF_STATUS_REJECT_NEEDS_FORCE:
204207
case REF_STATUS_REJECT_STALE:
205208
case REF_STATUS_REJECT_NODELETE:
209+
return CHECK_REF_STATUS_REJECTED;
206210
case REF_STATUS_UPTODATE:
207-
return 0;
211+
return CHECK_REF_UPTODATE;
208212
default:
209-
return 1;
213+
return 0;
210214
}
211215
}
212216

@@ -250,7 +254,7 @@ static int generate_push_cert(struct strbuf *req_buf,
250254
strbuf_addstr(&cert, "\n");
251255

252256
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)
254258
continue;
255259
update_seen = 1;
256260
strbuf_addf(&cert, "%s %s %s\n",
@@ -359,7 +363,7 @@ int send_pack(struct send_pack_args *args,
359363
* the pack data.
360364
*/
361365
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)
363367
continue;
364368

365369
if (!ref->deletion)
@@ -380,7 +384,7 @@ int send_pack(struct send_pack_args *args,
380384
if (args->dry_run || args->push_cert)
381385
continue;
382386

383-
if (!ref_update_to_be_sent(ref, args))
387+
if (check_to_send_update(ref, args) < 0)
384388
continue;
385389

386390
old_hex = sha1_to_hex(ref->old_sha1);

0 commit comments

Comments
 (0)