diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-08-15 12:23:51 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-08-15 12:53:09 -0700 |
commit | b05fbb724fe3525aa7db1368249d6bccd1c57271 (patch) | |
tree | e8e0a1e1ea1cca50bf970c5dbe0968fe4dbb3712 | |
parent | bde46371611c41c99c1385dd9b98fdb2262dab07 (diff) | |
download | git-b05fbb724fe3525aa7db1368249d6bccd1c57271.tar.gz |
send-pack: rename "new_refs" to "need_pack_data"
The variable counts how many non-deletiong command is being sent,
but is only checked with 0-ness to decide if we need to send the
pack data.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | send-pack.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/send-pack.c b/send-pack.c index c1c64ee777..590eb0a8ac 100644 --- a/send-pack.c +++ b/send-pack.c @@ -220,7 +220,7 @@ int send_pack(struct send_pack_args *args, struct strbuf req_buf = STRBUF_INIT; struct strbuf cap_buf = STRBUF_INIT; struct ref *ref; - int new_refs; + int need_pack_data = 0; int allow_deleting_refs = 0; int status_report = 0; int use_sideband = 0; @@ -276,13 +276,12 @@ int send_pack(struct send_pack_args *args, /* * Finally, tell the other end! */ - new_refs = 0; for (ref = remote_refs; ref; ref = ref->next) { if (!ref_update_to_be_sent(ref, args)) continue; if (!ref->deletion) - new_refs++; + need_pack_data = 1; if (args->dry_run) { ref->status = REF_STATUS_OK; @@ -327,7 +326,7 @@ int send_pack(struct send_pack_args *args, in = demux.out; } - if (new_refs && cmds_sent) { + if (need_pack_data && cmds_sent) { if (pack_objects(out, remote_refs, extra_have, args) < 0) { for (ref = remote_refs; ref; ref = ref->next) ref->status = REF_STATUS_NONE; |