git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v5 10/23] send-pack: rename "new_refs" to "need_pack_data"

From
Junio C Hamano <gitster@pobox.com>
Date
Sep 15, 2014, 22:24 UTC
Message-ID
<1410819864-22967-11-git-send-email-gitster@pobox.com>
In-Reply-To
<1410819864-22967-1-git-send-email-gitster@pobox.com>

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>
---
 send-pack.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/send-pack.c b/send-pack.c
index 0cb44ab..716c11b 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;
-- 
2.1.0-410-gd72dacd
Previous: Junio C HamanoNext: Junio C Hamano
Message 11 of 27 in “Signed push”
  1. 00/23 Signed pushJunio C Hamano, Sep 15, 2014
  2. 01/23 receive-pack: do not overallocate command structureJunio C Hamano, Sep 15, 2014
  3. 02/23 receive-pack: parse feature request a bit earlierJunio C Hamano, Sep 15, 2014
  4. 03/23 receive-pack: do not reuse old_sha1[] for other thingsJunio C Hamano, Sep 15, 2014
  5. 04/23 receive-pack: factor out queueing of commandJunio C Hamano, Sep 15, 2014
  6. 05/23 send-pack: move REF_STATUS_REJECT_NODELETE logic a bit higherJunio C Hamano, Sep 15, 2014
  7. 06/23 send-pack: refactor decision to send update per refJunio C Hamano, Sep 15, 2014
  8. 07/23 send-pack: always send capabilitiesJunio C Hamano, Sep 15, 2014
  9. 08/23 send-pack: factor out capability string generationJunio C Hamano, Sep 15, 2014
  10. 09/23 receive-pack: factor out capability string generationJunio C Hamano, Sep 15, 2014
  11. 10/23 send-pack: rename "new_refs" to "need_pack_data"Junio C Hamano, Sep 15, 2014
  12. 11/23 send-pack: refactor inspecting and resetting status and sending commandsJunio C Hamano, Sep 15, 2014
  13. 12/23 send-pack: clarify that cmds_sent is a booleanJunio C Hamano, Sep 15, 2014
  14. 13/23 gpg-interface: move parse_gpg_output() to where it should beJunio C Hamano, Sep 15, 2014
  15. 14/23 gpg-interface: move parse_signature() to where it should beJunio C Hamano, Sep 15, 2014
  16. 15/23 pack-protocol doc: typofix for PKT-LINEJunio C Hamano, Sep 15, 2014
  17. 16/23 push: the beginning of "git push --signed"Junio C Hamano, Sep 15, 2014
  18. 17/23 receive-pack: GPG-validate push certificatesJunio C Hamano, Sep 15, 2014
  19. 18/23 send-pack: send feature request on push-cert packetJunio C Hamano, Sep 15, 2014
  20. 19/23 signed push: remove duplicated protocol infoJunio C Hamano, Sep 15, 2014
  21. 20/23 signed push: add "pushee" header to push certificateJunio C Hamano, Sep 15, 2014
  22. 21/23 signed push: fortify against replay attacksJunio C Hamano, Sep 15, 2014
  23. 22/23 signed push: allow stale nonce in stateless modeJunio C Hamano, Sep 15, 2014
  24. 23/23 t5541: test push --signed to smart HTTP serverJunio C Hamano, Sep 15, 2014
  25. Jaime Soriano PastorSep 16, 2014
  26. Junio C HamanoSep 16, 2014
  27. Eric SunshineSep 16, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.