git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: mhagger@alum.mit.edu
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Jeff King <peff@peff.net>,
	Drew Northup <drew.northup@maine.edu>,
	Jakub Narebski <jnareb@gmail.com>,
	Heiko Voigt <hvoigt@hvoigt.net>,
	Johan Herland <johan@herland.net>,
	Julian Phillips <julian@quantumfyre.co.uk>,
	Michael Haggerty <mhagger@alum.mit.edu>
Subject: [PATCH 06/12] do_for_each_ref(): correctly terminate while processesing extra_refs
Date: Wed, 19 Oct 2011 23:44:46 +0200	[thread overview]
Message-ID: <1319060692-27216-7-git-send-email-mhagger@alum.mit.edu> (raw)
In-Reply-To: <1319060692-27216-1-git-send-email-mhagger@alum.mit.edu>

From: Michael Haggerty <mhagger@alum.mit.edu>

If the user-supplied function returns a nonzero value while processing
extra_refs, terminate without processing the rest of the list.

This probably has no practical importance, but makes the handling of
extra_refs a little bit more consistent with the handling of other
refs.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---

 refs.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/refs.c b/refs.c
index ae90993..7aef76c 100644
--- a/refs.c
+++ b/refs.c
@@ -706,8 +706,11 @@ static int do_for_each_ref(const char *submodule, const char *base, each_ref_fn
 
 	struct ref_array *extra = &extra_refs;
 
-	for (i = 0; i < extra->nr; i++)
+	for (i = 0; i < extra->nr; i++) {
 		retval = do_one_ref(base, fn, trim, flags, cb_data, extra->refs[i]);
+		if (retval)
+			goto end_each;
+	}
 
 	while (p < packed->nr && l < loose->nr) {
 		struct ref_entry *entry;
-- 
1.7.7

  parent reply	other threads:[~2011-10-19 21:45 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-19 21:44 [PATCH 00/12] Use refs API more consistently mhagger
2011-10-19 21:44 ` [PATCH 01/12] Rename another local variable name -> refname mhagger
2011-10-19 21:44 ` [PATCH 02/12] repack_without_ref(): remove temporary mhagger
2011-10-19 21:44 ` [PATCH 03/12] parse_ref_line(): add a check that the refname is properly formatted mhagger
2011-10-19 21:44 ` [PATCH 04/12] create_ref_entry(): extract function from add_ref() mhagger
2011-10-19 21:44 ` [PATCH 05/12] add_ref(): take a (struct ref_entry *) parameter mhagger
2011-10-19 21:44 ` mhagger [this message]
2011-10-19 21:44 ` [PATCH 07/12] do_for_each_ref_in_array(): new function mhagger
2011-10-19 21:44 ` [PATCH 08/12] do_for_each_ref_in_arrays(): " mhagger
2011-10-19 22:39   ` Junio C Hamano
2011-10-20  7:29     ` Michael Haggerty
2011-10-19 21:44 ` [PATCH 09/12] repack_without_ref(): reimplement using do_for_each_ref_in_array() mhagger
2011-10-19 21:44 ` [PATCH 10/12] names_conflict(): new function, extracted from is_refname_available() mhagger
2011-10-19 21:44 ` [PATCH 11/12] names_conflict(): simplify implementation mhagger
2011-10-19 21:44 ` [PATCH 12/12] is_refname_available(): reimplement using do_for_each_ref_in_array() mhagger
2011-10-20  1:40   ` Junio C Hamano
2011-10-20  7:46     ` Michael Haggerty
2011-10-24 11:58       ` Michael Haggerty

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=1319060692-27216-7-git-send-email-mhagger@alum.mit.edu \
    --to=mhagger@alum.mit.edu \
    --cc=drew.northup@maine.edu \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=hvoigt@hvoigt.net \
    --cc=jnareb@gmail.com \
    --cc=johan@herland.net \
    --cc=julian@quantumfyre.co.uk \
    --cc=peff@peff.net \
    /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).