git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stefan Beller <sbeller@google.com>
To: gitster@pobox.com
Cc: git@vger.kernel.org, pclouds@gmail.com, sunshine@sunshineco.com,
	mhagger@alum.mit.edu, ronniesahlberg@gmail.com,
	jrnieder@gmail.com, Stefan Beller <sbeller@google.com>
Subject: [PATCHv12 03/10] receive-pack.c: move iterating over all commands outside execute_commands
Date: Wed,  7 Jan 2015 19:23:17 -0800	[thread overview]
Message-ID: <1420687404-13997-4-git-send-email-sbeller@google.com> (raw)
In-Reply-To: <1420687404-13997-1-git-send-email-sbeller@google.com>

This commit allows us in a later patch to easily distinguish between
the non atomic way to update the received refs and the atomic way which
is introduced in a later patch.

Signed-off-by: Stefan Beller <sbeller@google.com>
---

Notes:
    v10, v11, v12:
    no changes
    
    v9:
     new and shiny. But makes the next patch easier to review.

 builtin/receive-pack.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index 3bdb158..0ccfb3d 100644
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -1064,6 +1064,18 @@ static void warn_if_skipped_connectivity_check(struct command *commands,
 		die("BUG: connectivity check skipped???");
 }
 
+static void execute_commands_non_atomic(struct command *commands,
+					struct shallow_info *si)
+{
+	struct command *cmd;
+	for (cmd = commands; cmd; cmd = cmd->next) {
+		if (!should_process_cmd(cmd))
+			continue;
+
+		cmd->error_string = update(cmd, si);
+	}
+}
+
 static void execute_commands(struct command *commands,
 			     const char *unpacker_error,
 			     struct shallow_info *si)
@@ -1098,12 +1110,7 @@ static void execute_commands(struct command *commands,
 	free(head_name_to_free);
 	head_name = head_name_to_free = resolve_refdup("HEAD", 0, sha1, NULL);
 
-	for (cmd = commands; cmd; cmd = cmd->next) {
-		if (!should_process_cmd(cmd))
-			continue;
-
-		cmd->error_string = update(cmd, si);
-	}
+	execute_commands_non_atomic(commands, si);
 
 	if (shallow_update)
 		warn_if_skipped_connectivity_check(commands, si);
-- 
2.2.1.62.g3f15098

  parent reply	other threads:[~2015-01-08  3:24 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-08  3:23 [PATCHv12 00/10] atomic pushes Stefan Beller
2015-01-08  3:23 ` [PATCHv12 01/10] receive-pack.c: shorten the execute_commands loop over all commands Stefan Beller
2015-01-08  3:23 ` [PATCHv12 02/10] receive-pack.c: die instead of error in case of possible future bug Stefan Beller
2015-01-08  3:23 ` Stefan Beller [this message]
2015-01-08  3:23 ` [PATCHv12 04/10] receive-pack.c: move transaction handling in a central place Stefan Beller
2015-01-08  3:23 ` [PATCHv12 05/10] receive-pack.c: add execute_commands_atomic function Stefan Beller
2015-01-08  3:23 ` [PATCHv12 06/10] receive-pack.c: negotiate atomic push support Stefan Beller
2015-01-08 23:51   ` Junio C Hamano
2015-01-12 23:29   ` Eric Sunshine
2015-01-12 23:43     ` Stefan Beller
2015-01-13  0:08     ` Junio C Hamano
2015-01-08  3:23 ` [PATCHv12 07/10] send-pack: rename ref_update_to_be_sent to check_to_send_update Stefan Beller
2015-01-08  3:23 ` [PATCHv12 08/10] send-pack.c: add --atomic command line argument Stefan Beller
2015-01-12 21:57   ` Junio C Hamano
2015-01-08  3:23 ` [PATCHv12 09/10] push.c: add an --atomic argument Stefan Beller
2015-01-08  3:23 ` [PATCHv12 10/10] t5543-atomic-push.sh: add basic tests for atomic pushes Stefan Beller
2015-01-12 23:40   ` Eric Sunshine

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1420687404-13997-4-git-send-email-sbeller@google.com \
    --to=sbeller@google.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jrnieder@gmail.com \
    --cc=mhagger@alum.mit.edu \
    --cc=pclouds@gmail.com \
    --cc=ronniesahlberg@gmail.com \
    --cc=sunshine@sunshineco.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).