Skip to content

Commit

Permalink
send-pack: rename "new_refs" to "need_pack_data"
Browse files Browse the repository at this point in the history
The variable counts how many non-deleting 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>
  • Loading branch information
Junio C Hamano committed Sep 15, 2014
1 parent 52d2ae5 commit ab2b0c9
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions send-pack.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit ab2b0c9

Please sign in to comment.