kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

send-pack: rename "new_refs" to "need_pack_data" 

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>
maint
Junio C Hamano 2014-08-15 12:23:51 -07:00
parent 52d2ae582e
commit ab2b0c908a
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
send-pack.c
View File

@ -220,7 +220,7 @@ int send_pack(struct send_pack_args *args,
struct strbuf req_buf = STRBUF_INIT; struct strbuf req_buf = STRBUF_INIT;
struct strbuf cap_buf = STRBUF_INIT; struct strbuf cap_buf = STRBUF_INIT;
struct ref *ref; struct ref *ref;
int new_refs; int need_pack_data = 0;
int allow_deleting_refs = 0; int allow_deleting_refs = 0;
int status_report = 0; int status_report = 0;
int use_sideband = 0; int use_sideband = 0;
@ -276,13 +276,12 @@ int send_pack(struct send_pack_args *args,
/* /*
* Finally, tell the other end! * Finally, tell the other end!
*/ */
new_refs = 0;
for (ref = remote_refs; ref; ref = ref->next) { for (ref = remote_refs; ref; ref = ref->next) {
if (!ref_update_to_be_sent(ref, args)) if (!ref_update_to_be_sent(ref, args))
continue; continue;


if (!ref->deletion) if (!ref->deletion)
new_refs++; need_pack_data = 1;


if (args->dry_run) { if (args->dry_run) {
ref->status = REF_STATUS_OK; ref->status = REF_STATUS_OK;
@ -327,7 +326,7 @@ int send_pack(struct send_pack_args *args,
in = demux.out; in = demux.out;
} }


if (new_refs && cmds_sent) { if (need_pack_data && cmds_sent) {
if (pack_objects(out, remote_refs, extra_have, args) < 0) { if (pack_objects(out, remote_refs, extra_have, args) < 0) {
for (ref = remote_refs; ref; ref = ref->next) for (ref = remote_refs; ref; ref = ref->next)
ref->status = REF_STATUS_NONE; ref->status = REF_STATUS_NONE;